fix event propagation and scrollbarbutton

alice0775 · Sep 9, 2019 · de715a1 · de715a1
1 parent 5994012
commit de715a1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/68/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js b/68/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js
@@ -5,6 +5,7 @@
 // @include        *
 // @compatibility  Firefox 67+
 // @author         Alice0775
+// @version        2019/09/09 22:20 fix event propagation and scrollbarbutton
 // @version        2019/09/09 workaround Bug 1575485 - Unable scroll Sidebar/Library window with turning the mouse wheel on scrollbar
 // ==/UserScript==
 var patchForBug1575485 = {
@@ -44,9 +45,13 @@ var patchForBug1575485 = {
       var scrollView = event.target;
       if (event.target.localName != "tree")
         return;
-      if (event.originalTarget.orient == "vertical"){
+      event.stopPropagation();
+      var target = event.originalTarget;
+      if (target.localName == "scrollbarbutton")
+        target = target.parentNode;
+      if (target.orient == "vertical"){
         this._scrollBy(scrollView, 0, event.deltaY);
-      } else if (event.originalTarget.orient == "horizontal"){
+      } else if (target.orient == "horizontal"){
         this._scrollBy(scrollView, event.deltaY, 0);
       }
     }

diff --git a/69/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js b/69/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js
@@ -5,6 +5,7 @@
 // @include        *
 // @compatibility  Firefox 67+
 // @author         Alice0775
+// @version        2019/09/09 22:20 fix event propagation and scrollbarbutton
 // @version        2019/09/09 workaround Bug 1575485 - Unable scroll Sidebar/Library window with turning the mouse wheel on scrollbar
 // ==/UserScript==
 var patchForBug1575485 = {
@@ -44,9 +45,13 @@ var patchForBug1575485 = {
       var scrollView = event.target;
       if (event.target.localName != "tree")
         return;
-      if (event.originalTarget.orient == "vertical"){
+      event.stopPropagation();
+      var target = event.originalTarget;
+      if (target.localName == "scrollbarbutton")
+        target = target.parentNode;
+      if (target.orient == "vertical"){
         this._scrollBy(scrollView, 0, event.deltaY);
-      } else if (event.originalTarget.orient == "horizontal"){
+      } else if (target.orient == "horizontal"){
         this._scrollBy(scrollView, event.deltaY, 0);
       }
     }

diff --git a/70/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js b/70/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js
@@ -5,6 +5,7 @@
 // @include        *
 // @compatibility  Firefox 67+
 // @author         Alice0775
+// @version        2019/09/09 22:20 fix event propagation and scrollbarbutton
 // @version        2019/09/09 workaround Bug 1575485 - Unable scroll Sidebar/Library window with turning the mouse wheel on scrollbar
 // ==/UserScript==
 var patchForBug1575485 = {
@@ -44,9 +45,13 @@ var patchForBug1575485 = {
       var scrollView = event.target;
       if (event.target.localName != "tree")
         return;
-      if (event.originalTarget.orient == "vertical"){
+      event.stopPropagation();
+      var target = event.originalTarget;
+      if (target.localName == "scrollbarbutton")
+        target = target.parentNode;
+      if (target.orient == "vertical"){
         this._scrollBy(scrollView, 0, event.deltaY);
-      } else if (event.originalTarget.orient == "horizontal"){
+      } else if (target.orient == "horizontal"){
         this._scrollBy(scrollView, event.deltaY, 0);
       }
     }

diff --git a/71/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js b/71/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js
@@ -5,6 +5,7 @@
 // @include        *
 // @compatibility  Firefox 67+
 // @author         Alice0775
+// @version        2019/09/09 22:20 fix event propagation and scrollbarbutton
 // @version        2019/09/09 workaround Bug 1575485 - Unable scroll Sidebar/Library window with turning the mouse wheel on scrollbar
 // ==/UserScript==
 var patchForBug1575485 = {
@@ -44,9 +45,13 @@ var patchForBug1575485 = {
       var scrollView = event.target;
       if (event.target.localName != "tree")
         return;
-      if (event.originalTarget.orient == "vertical"){
+      event.stopPropagation();
+      var target = event.originalTarget;
+      if (target.localName == "scrollbarbutton")
+        target = target.parentNode;
+      if (target.orient == "vertical"){
         this._scrollBy(scrollView, 0, event.deltaY);
-      } else if (event.originalTarget.orient == "horizontal"){
+      } else if (target.orient == "horizontal"){
         this._scrollBy(scrollView, event.deltaY, 0);
       }
     }