loleaflet/js/jquery.mCustomScrollbar.js | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
New commits: commit 2644c113c2b6c839793c9221d735de5e21cc76ed Author: Henry Castro <hcas...@collabora.com> AuthorDate: Fri Nov 15 10:13:10 2019 -0400 Commit: Henry Castro <hcas...@collabora.com> CommitDate: Sat Nov 16 19:28:31 2019 +0100 mCustomScrollbar: add event listener to pointer or touch events Some mobile devices support both pointer and touch events, so if we add event listener it will fire 2 times. Change-Id: Ida9862e9ee24e47ccbe3963b5c4ff18a173fffe0 Reviewed-on: https://gerrit.libreoffice.org/82799 Reviewed-by: Henry Castro <hcas...@collabora.com> Tested-by: Henry Castro <hcas...@collabora.com> diff --git a/loleaflet/js/jquery.mCustomScrollbar.js b/loleaflet/js/jquery.mCustomScrollbar.js index b2c91c88e..42876a14e 100644 --- a/loleaflet/js/jquery.mCustomScrollbar.js +++ b/loleaflet/js/jquery.mCustomScrollbar.js @@ -1267,7 +1267,24 @@ and dependencies (minified). }, /* -------------------- */ - + _getTouchEvents=function(namespace){ + var eventStart, eventMove, eventEnd; + if ('ontouchstart' in window){ + eventStart = "touchstart."+namespace; + eventMove = "touchmove."+namespace; + eventEnd = "touchend."+namespace; + } else if (window.MSPointerEvent){ + eventStart = "MSPointerDown."+namespace; + eventMove = "MSPointerMove."+namespace; + eventEnd = "MSPointerUp."+namespace; + } else if (window.PointerEvent){ + eventStart = "pointerdown."+namespace; + eventMove = "pointermove."+namespace; + eventEnd = "pointerup."+namespace; + } + return [eventStart, eventMove, eventEnd]; + }, + /* TOUCH SWIPE EVENTS scrolls content via touch swipe @@ -1282,11 +1299,7 @@ and dependencies (minified). draggable,dragY,dragX,touchStartY,touchStartX,touchMoveY=[],touchMoveX=[],startTime,runningTime,endTime,distance,speed,amount, durA=0,durB,overwrite=o.axis==="yx" ? "none" : "all",touchIntent=[],touchDrag,docDrag, iframe=mCSB_container.find("iframe"), - events=[ - "touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace, //start - "touchmove."+namespace+" pointermove."+namespace+" MSPointerMove."+namespace, //move - "touchend."+namespace+" pointerup."+namespace+" MSPointerUp."+namespace //end - ], + events=_getTouchEvents(namespace), touchAction=document.body.style.touchAction!==undefined; mCSB_container.bind(events[0],function(e){ _onTouchstart(e); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits