[Pkg-mozext-commits] [tabmixplus] 55/73: Fix Webstorm inspection errors - remove unnecessary local variables, which add nothing to the comprehensibility of a function

David Prévot taffit at moszumanska.debian.org
Mon May 9 02:30:56 UTC 2016


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

taffit pushed a commit to branch master
in repository tabmixplus.

commit 938b62e715c42876c4637ae85fe9c87c7e0ca0cd
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sat Apr 23 14:38:13 2016 +0300

    Fix Webstorm inspection errors - remove unnecessary local variables, which add nothing to the comprehensibility of a function
---
 chrome/content/content.js              |  3 +--
 chrome/content/links/setup.js          |  3 +--
 chrome/content/session/session.js      | 10 ++++------
 chrome/content/session/sessionStore.js |  6 +++---
 chrome/content/tab/tab.js              |  6 ++----
 modules/Utils.jsm                      |  4 ++--
 6 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/chrome/content/content.js b/chrome/content/content.js
index 72fefcf..558a33c 100644
--- a/chrome/content/content.js
+++ b/chrome/content/content.js
@@ -100,8 +100,7 @@ var TabmixContentHandler = {
         break;
       }
       case "Tabmix:setScrollPosition": {
-        let {x, y} = data;
-        content.scrollTo(x, y);
+        content.scrollTo(data.x, data.y);
         break;
       }
       case "Tabmix:collectReloadData": {
diff --git a/chrome/content/links/setup.js b/chrome/content/links/setup.js
index 89f783b..336a7de 100644
--- a/chrome/content/links/setup.js
+++ b/chrome/content/links/setup.js
@@ -266,8 +266,7 @@ Tabmix.beforeStartup = function TMP_beforeStartup(tabBrowser, aTabContainer) {
     tabscroll = 1;
   }
   TabmixTabbar.scrollButtonsMode = tabscroll;
-  let flowing = ["singlebar", "scrollbutton", "multibar", "scrollbutton"][tabscroll];
-  TabmixTabbar.flowing = flowing;
+  TabmixTabbar.flowing = ["singlebar", "scrollbutton", "multibar", "scrollbutton"][tabscroll];
 
   // add flag that we are after SwitchThemes, we use it in Tabmix.isWindowAfterSessionRestore
   if ("SwitchThemesModule" in window && SwitchThemesModule.windowsStates && SwitchThemesModule.windowsStates.length)
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index baff41e..ac27c16 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -733,8 +733,8 @@ TabmixSessionManager = {
     var undoClose = Tabmix.prefs.getBoolPref("undoClose");
 
     // hide or show session manager buttons & menus
-    var showInMenu = !sessionManager || !Tabmix.prefs.getBoolPref("sessionToolsMenu");
-    document.getElementById("tm-sessionmanager").hidden = showInMenu;
+    document.getElementById("tm-sessionmanager").hidden =
+        !sessionManager || !Tabmix.prefs.getBoolPref("sessionToolsMenu");
     let sm = document.getElementById("appmenu-sessionmanager");
     if (sm)
       sm.hidden = !sessionManager;
@@ -1352,8 +1352,7 @@ TabmixSessionManager = {
     if (!session.saveClosedTabs)
       this.deleteAllClosedtabs(container);
     if (count) {
-      let {nameExt} = aTriggerNode;
-      this.insertSession(count, session.name, path, pathToReplace, nameExt);
+      this.insertSession(count, session.name, path, pathToReplace, aTriggerNode.nameExt);
     } else {
       Tabmix.log("Error in saveClosedSession");
     }
@@ -3121,8 +3120,7 @@ TabmixSessionManager = {
         this.saveOneWindow(this.gSessionPath[0], "", true);
       this.loadOneWindow(winData, "openclosedwindow");
     } else {
-      let win = this.openNewWindow(winData, this.isPrivateWindow);
-      TabmixSvc.sm.windowToFocus = win;
+      TabmixSvc.sm.windowToFocus = this.openNewWindow(winData, this.isPrivateWindow);
     }
   },
 
diff --git a/chrome/content/session/sessionStore.js b/chrome/content/session/sessionStore.js
index 0869bea..341ae57 100644
--- a/chrome/content/session/sessionStore.js
+++ b/chrome/content/session/sessionStore.js
@@ -851,9 +851,9 @@ var TabmixConvertSession = {
               extData.__tabmixTGM = RegExp.$2;
               break;
             }
-            let [groupId, groupName] = RegExp.$2.split(" ");
-            extData.TabGroupsManagerGroupId = groupId;
-            extData.TabGroupsManagerGroupName = groupName;
+            let data = RegExp.$2.split(" ");
+            extData.TabGroupsManagerGroupId = data[0];
+            extData.TabGroupsManagerGroupName = data[1];
             break;
           }
           case "faviconized":
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index edbb4bb..1725c55 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -85,8 +85,7 @@ var TabmixTabbar = {
         Tabmix.setItem(tabmixScrollBox, "collapsed", true);
       }
 
-      let flowing = ["singlebar", "scrollbutton", "multibar", "scrollbutton"][tabscroll];
-      this.flowing = flowing;
+      this.flowing = ["singlebar", "scrollbutton", "multibar", "scrollbutton"][tabscroll];
       let isDefault = tabscroll == this.SCROLL_BUTTONS_LEFT_RIGHT || null;
       Tabmix.setItem(tabBar, "defaultScrollButtons", isDefault);
       Tabmix.setItem(tabmixScrollBox, "defaultScrollButtons", isDefault);
@@ -1028,9 +1027,8 @@ Tabmix.tabsUtils = {
     let active = this.getTabRowNumber(gBrowser.selectedTab, this.topTabY);
     let rowsStr = TabmixSvc.getString("rowsTooltip.rowscount");
     let activeStr = TabmixSvc.getString("rowsTooltip.activetab");
-    let tooltip = PluralForm.get(rows, rowsStr).replace("#1", rows) +
+    box.label = PluralForm.get(rows, rowsStr).replace("#1", rows) +
         "\n" + activeStr.replace("#1", active);
-    box.label = tooltip;
   },
 
   isSingleRow: function(visibleTabs) {
diff --git a/modules/Utils.jsm b/modules/Utils.jsm
index 5d75bfb..369f48b 100644
--- a/modules/Utils.jsm
+++ b/modules/Utils.jsm
@@ -40,9 +40,9 @@ this.TabmixUtils = {
     // call TabmixAboutNewTab.updateBrowser for gBrowser._preloadedBrowser,
     // if it already exist before we loaded our frame script
     if (TabmixSvc.version(420)) {
-      let {gBrowser, BROWSER_NEW_TAB_URL} = window;
+      let gBrowser = window.gBrowser;
       if (TabmixSvc.prefBranch.getBoolPref("titlefrombookmark") &&
-          BROWSER_NEW_TAB_URL == TabmixSvc.aboutNewtab &&
+          window.BROWSER_NEW_TAB_URL == TabmixSvc.aboutNewtab &&
           gBrowser._preloadedBrowser && gBrowser._isPreloadingEnabled() &&
           !PrivateBrowsingUtils.isWindowPrivate(window)) {
         TabmixAboutNewTab.updateBrowser(gBrowser._preloadedBrowser);

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



More information about the Pkg-mozext-commits mailing list