[Pkg-mozext-commits] [tabmixplus] 16/22: Don't use pending attribute from xul browser, Firefox 55 - bug 1370035 remove this attribute

[David Prévot]

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

taffit pushed a commit to tag 0.5.0.4pre.170625a1
in repository tabmixplus.

commit b17b3623c61d7263a853552d558caa70b3291b30
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Jun 19 19:06:07 2017 +0300

    Don't use pending attribute from xul browser, Firefox 55 - bug 1370035 remove this attribute
---
 chrome/content/links/setup.js     | 6 ++++--
 chrome/content/session/session.js | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/chrome/content/links/setup.js b/chrome/content/links/setup.js
index c30a6ec..9a46072 100644
--- a/chrome/content/links/setup.js
+++ b/chrome/content/links/setup.js
@@ -195,9 +195,11 @@ Tabmix.beforeStartup = function TMP_beforeStartup(tabBrowser, aTabContainer) {
 
   tabBrowser.isBlankBrowser = function TMP_isBlankBrowser(aBrowser, aboutBlank) {
     try {
-      if (Tabmix.isVersion(550) && aBrowser.hasAttribute("pending")) {
+      if (Tabmix.isVersion(550)) {
         let tab = this.getTabForBrowser(aBrowser);
-        return TMP_SessionStore.isBlankPendingTab(tab);
+        if (tab.hasAttribute("pending")) {
+          return TMP_SessionStore.isBlankPendingTab(tab);
+        }
       }
       if (!aBrowser || !aBrowser.currentURI)
         return true;
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 8c34614..65655a4 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -3522,7 +3522,7 @@ TabmixSessionManager = {
   // reset tab's attributes and history
   resetTab: function TMP_resetAttributes(aTab) {
     let browser = gBrowser.getBrowserForTab(aTab);
-    if (!browser.hasAttribute("pending")) {
+    if (!aTab.hasAttribute("pending")) {
       browser.stop();
     }
     // reset old history

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