[Pkg-mozext-commits] [tabmixplus] 04/30: Object.prototype.__noSuchMethod__ is obsolete since Firefox 39 - part 1

[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 612e9e7397711b644e27b2c75436451563c58ec7
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Mar 25 22:10:48 2015 +0200

    Object.prototype.__noSuchMethod__ is obsolete since Firefox 39 - part 1
---
 chrome/content/minit/minit.js          | 9 ---------
 chrome/content/minit/tabView.js        | 6 +++---
 chrome/content/session/session.js      | 5 +++--
 chrome/content/session/sessionStore.js | 6 ++++--
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/chrome/content/minit/minit.js b/chrome/content/minit/minit.js
index 916b802..86fc8c8 100644
--- a/chrome/content/minit/minit.js
+++ b/chrome/content/minit/minit.js
@@ -906,15 +906,6 @@ Tabmix.hidePopup = function TMP_hidePopup(aPopupMenu) {
 };
 
 var TMP_TabView = { /* jshint ignore: line */
-  __noSuchMethod__: function(id, args) {
-    if (!this.installed)
-      return;
-    if (typeof TabView[id] == "function")
-      TabView[id].apply(TabView, args);
-    else
-      Tabmix.log("Error " + id + " is not exist in TabView", true);
-  },
-
   get installed() {
     delete this.installed;
     let installed = typeof TabView == "object";
diff --git a/chrome/content/minit/tabView.js b/chrome/content/minit/tabView.js
index 1394b1c..8528660 100644
--- a/chrome/content/minit/tabView.js
+++ b/chrome/content/minit/tabView.js
@@ -191,7 +191,7 @@
   TabmixSessionManager._setWindowStateBusy = function SM__setWindowStateBusy(aWindow) {
     TMP_SessionStore.initService();
     this._sendWindowStateEvent("Busy");
-    this._getdSessionTabviewData(aWindow);
+    this._getSessionTabviewData(aWindow);
 
     // save group count before we start the restore
     var parsedData = TabmixSessionData.getWindowValue(window, "tabview-groups", true);
@@ -206,7 +206,7 @@
 
     var parsedData = TabmixSessionData.getWindowValue(window, "tabview-groups", true);
     var groupCount = parsedData.totalNumber || 1;
-    TMP_TabView.updateGroupNumberBroadcaster(groupCount);
+    TabView.updateGroupNumberBroadcaster(groupCount);
 
     // show notification
 ///XXX make sure that we have hidden tabs
@@ -232,7 +232,7 @@
   TabmixSessionManager._groupItems=  null;
 
   // aWindow: rdfNodeWindow to read from
-  TabmixSessionManager._getdSessionTabviewData = function SM__getdSessionTabviewData(aWindow) {
+  TabmixSessionManager._getSessionTabviewData = function SM__getSessionTabviewData(aWindow) {
     let self = this;
     function _fixData(id, parse, def) {
       let data = self.getLiteralValue(aWindow, id);
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 633c001..361c503 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -2370,7 +2370,8 @@ try{
 
       // now that we open our tabs init TabView again
       TMP_SessionStore.initService();
-      TMP_TabView.init();
+      if (this.tabViewInstalled)
+         TabView.init();
 
       this._sendRestoreCompletedNotifications(true);
    },
@@ -3781,7 +3782,7 @@ try{
 
   get tabViewInstalled() {
     delete this.tabViewInstalled;
-    return (this.tabViewInstalled = typeof TabView == "object");
+    return (this.tabViewInstalled = TMP_TabView.installed);
   },
 
   _sendWindowStateEvent: function SM__sendWindowStateEvent(aType) {
diff --git a/chrome/content/session/sessionStore.js b/chrome/content/session/sessionStore.js
index 80f645b..b6d660b 100644
--- a/chrome/content/session/sessionStore.js
+++ b/chrome/content/session/sessionStore.js
@@ -568,7 +568,8 @@ var TMP_ClosedTabs = { // jshint ignore:line
       else if (typeof(aTabToRemove) == "undefined" && gBrowser.isBlankNotBusyTab(cTab))
          aTabToRemove = cTab;
 
-      TMP_TabView.prepareUndoCloseTab(aTabToRemove);
+      if (TMP_TabView.installed)
+         TabView.prepareUndoCloseTab(aTabToRemove);
 
       if (aTabToRemove)
          aTabToRemove.collapsed = true;
@@ -582,7 +583,8 @@ var TMP_ClosedTabs = { // jshint ignore:line
       // add restored tab to current window
       TabmixSvc.ss.setTabState(newTab, TabmixSvc.JSON.stringify(tabData.state));
 
-      TMP_TabView.afterUndoCloseTab();
+      if (TMP_TabView.installed)
+         TabView.afterUndoCloseTab();
 
       // after we open new tab we only need to fix position if this is true
       // we don't call moveTabTo from add tab if it called from sss_undoCloseTab

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