From 10f8c937593fa6defe6b4998e580eb522f0ec03e Mon Sep 17 00:00:00 2001 From: Skripatch Date: Wed, 31 Aug 2016 16:47:40 +0300 Subject: [PATCH] Fix exception inside iframe without access --- jquery.mCustomScrollbar.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jquery.mCustomScrollbar.js b/jquery.mCustomScrollbar.js index 4c9a0b2..727cc1e 100644 --- a/jquery.mCustomScrollbar.js +++ b/jquery.mCustomScrollbar.js @@ -1097,7 +1097,8 @@ and dependencies (minified). if(o.advanced.extraDraggableSelectors){sel.add($(o.advanced.extraDraggableSelectors));} if(d.bindEvents){ /* check if events are bound */ /* unbind namespaced events from document/selectors */ - $(document).add($(!_canAccessIFrame() || top.document)).unbind("."+namespace); + var doc=_canAccessIFrame() ? top.document : document; + $(document).add($(doc)).unbind("."+namespace); sel.each(function(){ $(this).unbind("."+namespace); }); @@ -1189,7 +1190,8 @@ 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); + doc=_canAccessIFrame() ? top.document : document, + eds=o.advanced.extraDraggableSelectors ? $(doc).add($(o.advanced.extraDraggableSelectors)) : $(doc); mCSB_dragger.bind("contextmenu."+namespace,function(e){ e.preventDefault(); //prevent right click }).bind("mousedown."+namespace+" touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace,function(e){ @@ -2455,4 +2457,4 @@ and dependencies (minified). }); -}))})); \ No newline at end of file +}))}));