loleaflet/js/jquery.mCustomScrollbar.js | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 683b347032ea35bfc9c38ff7a2b5965364f017a4
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Mon Nov 19 10:07:28 2018 +0100
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Nov 19 10:09:05 2018 +0100
Revert "Awful but effective hack that seems to fix the jumping after touch
gestures"
See discussion in https://gerrit.libreoffice.org/#/c/63437
This reverts commit 657076d6207bc141572381a918785fbd8fd733f3.
Change-Id: I7bc2330011bc389041375928d0cae98eeea8a647
Reviewed-on: https://gerrit.libreoffice.org/63550
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/loleaflet/js/jquery.mCustomScrollbar.js
b/loleaflet/js/jquery.mCustomScrollbar.js
index f280a6e1c..38cc715af 100644
--- a/loleaflet/js/jquery.mCustomScrollbar.js
+++ b/loleaflet/js/jquery.mCustomScrollbar.js
@@ -2112,9 +2112,7 @@ and dependencies (minified).
onStart:function(){
if(options.callbacks && options.onStart
&& !d.tweenRunning){
/* callbacks: onScrollStart */
- if(!window.ThisIsAMobileApp){
-
if(_cb("onScrollStart")){_mcs(); o.callbacks.onScrollStart.call(el[0]);}
- }
+
if(_cb("onScrollStart")){_mcs(); o.callbacks.onScrollStart.call(el[0]);}
d.tweenRunning=true;
_onDragClasses(mCSB_dragger);
d.cbOffsets=_cbOffsets();
@@ -2122,9 +2120,7 @@ and dependencies (minified).
},onUpdate:function(){
if(options.callbacks &&
options.onUpdate){
/* callbacks: whileScrolling */
- if(!window.ThisIsAMobileApp){
-
if(_cb("whileScrolling")){_mcs(); o.callbacks.whileScrolling.call(el[0]);}
- }
+
if(_cb("whileScrolling")){_mcs(); o.callbacks.whileScrolling.call(el[0]);}
}
},onComplete:function(){
if(options.callbacks &&
options.onComplete){
@@ -2132,11 +2128,9 @@ and dependencies (minified).
var
t=mCSB_container[0].idleTimer || 0;
mCSB_container[0].onCompleteTimeout=setTimeout(function(){
/* callbacks: onScroll,
onTotalScroll, onTotalScrollBack */
-
if(!window.ThisIsAMobileApp){
-
if(_cb("onScroll")){_mcs(); o.callbacks.onScroll.call(el[0]);}
-
if(_cb("onTotalScroll") && scrollTo[1]>=limit[1]-totalScrollOffset &&
d.cbOffsets[0]){_mcs(); o.callbacks.onTotalScroll.call(el[0]);}
-
if(_cb("onTotalScrollBack") && scrollTo[1]<=totalScrollBackOffset &&
d.cbOffsets[1]){_mcs(); o.callbacks.onTotalScrollBack.call(el[0]);}
- }
+
if(_cb("onScroll")){_mcs(); o.callbacks.onScroll.call(el[0]);}
+ if(_cb("onTotalScroll")
&& scrollTo[1]>=limit[1]-totalScrollOffset && d.cbOffsets[0]){_mcs();
o.callbacks.onTotalScroll.call(el[0]);}
+
if(_cb("onTotalScrollBack") && scrollTo[1]<=totalScrollBackOffset &&
d.cbOffsets[1]){_mcs(); o.callbacks.onTotalScrollBack.call(el[0]);}
d.tweenRunning=false;
mCSB_container[0].idleTimer=0;
_onDragClasses(mCSB_dragger,"hide");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
