From de715a1ac433e96627013ebe5cfb4f4e3c9354a9 Mon Sep 17 00:00:00 2001 From: alice0775 Date: Mon, 9 Sep 2019 22:33:50 +0900 Subject: [PATCH] fix event propagation and scrollbarbutton --- 68/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js | 9 +++++++-- 69/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js | 9 +++++++-- 70/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js | 9 +++++++-- 71/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js | 9 +++++++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/68/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js b/68/patchForBug1575485_wheelScrollOnScrollbarOfTree.uc.js index 429e37a..ccd3652 100644 --- 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 index 429e37a..ccd3652 100644 --- 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 index 429e37a..ccd3652 100644 --- 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 index 429e37a..ccd3652 100644 --- 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); } }