[Pkg-mozext-commits] [tabmixplus] 17/22: Update compatibility with TabGgroupManager (changeset e76538fa7d29)

[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 2a2755400ab5c306d797700ee6407f3fe3128614
Author: onemen <tabmix.onemen at gmail.com>
Date:   Tue Jun 20 14:14:22 2017 +0300

    Update compatibility with TabGgroupManager (changeset e76538fa7d29)
---
 chrome/content/extensions/extensions.js |  8 ++++++++
 modules/extensions/TabGroupsManager.jsm | 11 ++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/chrome/content/extensions/extensions.js b/chrome/content/extensions/extensions.js
index d812584..5b432fe 100644
--- a/chrome/content/extensions/extensions.js
+++ b/chrome/content/extensions/extensions.js
@@ -221,6 +221,14 @@ var TMP_extensionsCompatibility = {
   },
 
   onWindowOpen: function TMP_EC_onWindowOpen() {
+    // https://addons.mozilla.org/firefox/addon/tabgroups-manager-revived
+    // TabGroupsManager.OverrideMethod set TabmixSessionManager.loadOneWindow to string by error
+    if (Tabmix.extensions.tabGroupManager &&
+        typeof TabmixSessionManager.loadOneWindow == "string") {
+      Tabmix._makeCode("TabmixSessionManager.loadOneWindow", TabmixSessionManager.loadOneWindow);
+      Tabmix.log("typeof TabmixSessionManager.loadOneWindow " + typeof TabmixSessionManager.loadOneWindow);
+    }
+
     this.setVerticalTabs();
 
     // Look for RSS/Atom News Reader
diff --git a/modules/extensions/TabGroupsManager.jsm b/modules/extensions/TabGroupsManager.jsm
index 65bde73..69435cf 100644
--- a/modules/extensions/TabGroupsManager.jsm
+++ b/modules/extensions/TabGroupsManager.jsm
@@ -75,11 +75,11 @@ this.TMP_TabGroupsManager = {
 
     this.changeCode(sessionManager, "TabmixSessionManager.loadOneWindow")._replace(
       // get saved group data and replace ids with new one
-      'var lastSelectedIndex = restoreSelect ? this.getIntValue(rdfNodeWindow, "selectedIndex") : 0;',
+      'var lastSelectedIndex = restoreSelect ? winData.selected - 1 : 0;',
       '$&' +
       '  var [_restoreSelect, _lastSelectedIndex] = [restoreSelect, lastSelectedIndex];' +
       '  [restoreSelect, lastSelectedIndex] = [false, 0];' +
-      '  let jsonText = this.getLiteralValue(rdfNodeWindow, "tgm_jsonText");' +
+      '  let jsonText = winData.extData && winData.extData.TabGroupsManagerAllGroupsData;' +
       '  TabGroupsManager.session.groupRestored = 1;' +
       '  if (jsonText) {' +
       '    if ("__SSi" in window)' +
@@ -94,8 +94,7 @@ this.TMP_TabGroupsManager = {
       '  gBrowser.moveTabTo(newTab, gBrowser.tabs.length - 1);' +
       '  gBrowser.selectedTab = newTab;' +
       '  newIndex = newTab._tPos;' +
-      '  let group = TabGroupsManager.allGroups.openNewGroupActive(' +
-      '        newTab, -1);' +
+      '  TabGroupsManager.allGroups.openNewGroupActive(newTab, -1);' +
       '  for (let i = 1; i < newtabsCount; i++) {' +
       '    TMP_addTab();' +
       '  }' +
@@ -103,9 +102,11 @@ this.TMP_TabGroupsManager = {
       'if (false) {'
     )._replace(
       'TMP_ClosedTabs.setButtonDisableState();',
-      '  if (_restoreSelect && (overwrite || (!concatenate && !currentTabIsBlank)))' +
+      '  let isBlank = gBrowser.isBlankNotBusyTab(cTab);' +
+      '  if (_restoreSelect && (overwrite || !isBlank)) {' +
       '    this.updateSelected(newIndex + _lastSelectedIndex, overwrite ||' +
       '                        caller=="firstwindowopen" || caller=="windowopenedbytabmix");' +
+      '  }' +
       '  $&'
     )._replace(
       'TabmixSvc.SessionStore[fnName](window, tabs, tabsData, 0);',

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