[Libreoffice-commits] online.git: loleaflet/js
Henry Castro (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jul 17 15:57:05 UTC 2020
loleaflet/js/jquery.mCustomScrollbar.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 57233337976b8e8556e9a49e3618feda3ae8d95f
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Jul 17 09:56:14 2020 -0400
Commit: Henry Castro <hcastro at collabora.com>
CommitDate: Fri Jul 17 17:56:46 2020 +0200
mCustomScrollbar: fix "Uncaught TypeError: Cannot read property"
Running a local nextcloud instance, it throws an uncaught type error.
Change-Id: I48f553f4e4a4704fa4f2753e9af5207c4d95e5f9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98977
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Tested-by: Jenkins
Reviewed-by: Henry Castro <hcastro at collabora.com>
diff --git a/loleaflet/js/jquery.mCustomScrollbar.js b/loleaflet/js/jquery.mCustomScrollbar.js
index f147bc2e8..eba3ccefe 100644
--- a/loleaflet/js/jquery.mCustomScrollbar.js
+++ b/loleaflet/js/jquery.mCustomScrollbar.js
@@ -1210,7 +1210,7 @@ and dependencies (minified).
mCSB_dragger=$("#"+draggerId[0]+",#"+draggerId[1]),
draggable,dragY,dragX,
rds=o.advanced.releaseDraggableSelectors ? mCSB_dragger.add($(o.advanced.releaseDraggableSelectors)) : mCSB_dragger,
- eds=o.advanced.extraDraggableSelectors ? $(!_canAccessIFrame() || top.document).add($(o.advanced.extraDraggableSelectors)) : $(!_canAccessIFrame() || top.document);
+ eds=o.advanced.extraDraggableSelectors ? $(!_canAccessIFrame() || top.document).add($(o.advanced.extraDraggableSelectors)) : $(_canAccessIFrame() ? top.document : false);
mCSB_dragger.bind("contextmenu."+namespace,function(e){
e.preventDefault(); //prevent right click
}).bind("mousedown."+namespace+" touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace,function(e){
More information about the Libreoffice-commits
mailing list