[Pkg-mozext-commits] [tabmixplus] 44/61: Leftover from changeset 5428fdcf5c9f, follow up bug 947854 - Exiting DOM fullscreen also exits window fullscreen mode

[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 899dbd5a408646b2697d66cac435ebe958fe8a2e
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Aug 14 12:46:50 2015 +0300

    Leftover from changeset 5428fdcf5c9f, follow up bug 947854 - Exiting DOM fullscreen also exits window fullscreen mode
---
 chrome/content/tabmix.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index d1c5cd1..f0353fa 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -688,7 +688,7 @@ var TMP_eventListener = {
             'this._isChromeCollapsed = true;',
             'TMP_eventListener._updateMarginBottom(gNavToolbox.style.marginTop);' + $LF +
             '$&' + $LF +
-            'TMP_eventListener.toggleTabbarVisibility(false);'
+            'TMP_eventListener.toggleTabbarVisibility(false, aAnimate);'
           ).toCode();
         }
         else
@@ -731,7 +731,7 @@ var TMP_eventListener = {
   },
 
   // for tabs bellow content
-  toggleTabbarVisibility: function (aShow) {
+  toggleTabbarVisibility: function(aShow, aAnimate) {
     if (TabmixTabbar.position != 1)
       return;
     let fullScrToggler = document.getElementById("fullscr-bottom-toggler");
@@ -746,6 +746,19 @@ var TMP_eventListener = {
       bottomToolbox.style.marginBottom =
           -(bottomToolbox.getBoundingClientRect().height +
           bottombox.getBoundingClientRect().height) + "px";
+
+      if (Tabmix.isVersion(400) && aAnimate &&
+          Services.prefs.getBoolPref("browser.fullscreen.animate")) {
+        // Hide the fullscreen toggler until the transition ends.
+        let listener = function() {
+          gNavToolbox.removeEventListener("transitionend", listener, true);
+          if (FullScreen._isChromeCollapsed)
+            fullScrToggler.hidden = false;
+        };
+        gNavToolbox.addEventListener("transitionend", listener, true);
+        fullScrToggler.hidden = true;
+      }
+
       // Until Firefox 41 changing the margin trigger resize event that calls
       // updateTabbarBottomPosition
       if (Tabmix.isVersion(410))

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