[Pkg-mozext-commits] [tabmixplus] 05/09: Follow up bug 1387130 - Use original tabstrip scrolling behaviour when using scrollbuttons

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 25e05c85c52fb7923ea5fecc0a6b4eb18ecf8692
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Sep 8 12:20:42 2017 +0300

    Follow up bug 1387130 - Use original tabstrip scrolling behaviour when using scrollbuttons
---
 chrome/content/tab/scrollbox.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/chrome/content/tab/scrollbox.xml b/chrome/content/tab/scrollbox.xml
index f870763..072a97b 100644
--- a/chrome/content/tab/scrollbox.xml
+++ b/chrome/content/tab/scrollbox.xml
@@ -236,12 +236,6 @@
                amountToScroll = this._distanceToRow(amountToScroll);'
             ).toCode();
 
-            // we divide scrollDelta by the ratio between tab width and tab height
-            Tabmix.changeCode(this._arrowScrollAnim, "scrollbox._arrowScrollAnim.sample")._replace(
-              '0.5 * timePassed * scrollIndex',
-              'this.scrollbox.isMultiRow ? $& / this.scrollbox._verticalAnimation : $&'
-            ).toCode();
-
             // the ratio between tab width and tab height is approximately 6
             // we multiply here the distance to get same animation effect.
             Tabmix.changeCode(this._scrollAnim, "scrollbox._scrollAnim.start")._replace(
@@ -259,6 +253,15 @@
             };
           }
 
+          // Bug 1387130 (landed in Firefox 57) - Use original tabstrip scrolling behaviour when using scrollbuttons
+          if (this._arrowScrollAnim) {
+            // we divide scrollDelta by the ratio between tab width and tab height
+            Tabmix.changeCode(this._arrowScrollAnim, "scrollbox._arrowScrollAnim.sample")._replace(
+              '0.5 * timePassed * scrollIndex',
+              'this.scrollbox.isMultiRow ? $& / this.scrollbox._verticalAnimation : $&'
+            ).toCode();
+          }
+
           Tabmix.changeCode(this, "scrollbox._distanceScroll")._replace(
             '{',
             '{ if (aEvent.button && aEvent.button == 2) return;'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git