[Pkg-mozext-commits] [tabmixplus] 56/107: Apply Eslint new rule (version 1.9.0) : no-case-declarations
David Prévot
taffit at moszumanska.debian.org
Tue Dec 29 19:02:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit ebef2fb5df2ca8a86eb290455b88511da1a6c295
Author: onemen <tabmix.onemen at gmail.com>
Date: Fri Nov 6 20:22:54 2015 +0200
Apply Eslint new rule (version 1.9.0) : no-case-declarations
---
.eslintrc | 1 +
chrome/content/click/click.js | 12 ++++++++----
chrome/content/content.js | 30 ++++++++++++++++++++----------
chrome/content/links/userInterface.js | 6 ++++--
chrome/content/minit/tablib.js | 6 ++++--
chrome/content/places/places.js | 3 ++-
chrome/content/tab/tab.js | 24 ++++++++++++++++--------
chrome/content/tabmix.js | 6 ++++--
modules/Utils.jsm | 3 ++-
9 files changed, 61 insertions(+), 30 deletions(-)
diff --git a/.eslintrc b/.eslintrc
index 0169c93..3117a36 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -75,6 +75,7 @@
"no-extra-boolean-cast": 2,
"no-extra-parens": 0, // TODO need to fix this...
"no-extra-semi": 2,
+ "no-case-declarations": 2,
"no-fallthrough": 2,
"no-floating-decimal": 0,
"no-func-assign": 2,
diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index 4248c72..f08b0cb 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -770,10 +770,11 @@ var TabmixAllTabs = {
backupLabel: "",
handleEvent: function TMP_AT_handleEvent(aEvent) {
switch (aEvent.type) {
- case "TabAttrModified":
+ case "TabAttrModified": {
let tab = aEvent.target;
this._setMenuitemAttributes(tab.mCorrespondingMenuitem, tab);
break;
+ }
case "TabClose":
this._tabOnTabClose(aEvent);
break;
@@ -941,7 +942,7 @@ var TabmixAllTabs = {
var i;
switch (aType) {
- case 1:
+ case 1: {
let TabSorting = function _tabSorting(tab, index) {
this.Tab = tab;
this.Index = index;
@@ -957,7 +958,8 @@ var TabmixAllTabs = {
for (i = 0; i < tabs.length; i++)
this.createMenuItems(popup, tabs[i].Tab, tabs[i].Index);
break;
- case 2:
+ }
+ case 2: {
tabs = gBrowser.visibleTabs;
let addToMenu = side != "right";
for (let t = 0; t < tabs.length; t++) {
@@ -975,7 +977,8 @@ var TabmixAllTabs = {
this.createMenuItems(popup, tab, t);
}
break;
- case 3:
+ }
+ case 3: {
for (i = TMP_LastTab.tabs.length - 1; i >= 0; i--) {
let tab = TMP_LastTab.tabs[i];
if (tab.hidden)
@@ -983,6 +986,7 @@ var TabmixAllTabs = {
this.createMenuItems(popup, tab, i);
}
break;
+ }
}
if (this._selectedItem)
diff --git a/chrome/content/content.js b/chrome/content/content.js
index f4f2a8a..7830572 100644
--- a/chrome/content/content.js
+++ b/chrome/content/content.js
@@ -64,7 +64,7 @@ var TabmixContentHandler = {
return;
}
switch (name) {
- case "Tabmix:restorePermissions":
+ case "Tabmix:restorePermissions": {
let disallow = new Set(data.disallow && data.disallow.split(","));
DocShellCapabilities.restore(docShell, disallow);
sendSyncMessage("Tabmix:restorePermissionsComplete", {
@@ -72,34 +72,41 @@ var TabmixContentHandler = {
reload: data.reload
});
break;
- case "Tabmix:collectPermissions":
+ }
+ case "Tabmix:collectPermissions": {
let caps = DocShellCapabilities.collect(docShell).join(",");
sendSyncMessage("Tabmix:collectPermissionsComplete", {caps: caps});
break;
- case "Tabmix:resetContentName":
+ }
+ case "Tabmix:resetContentName": {
if (content.name)
content.name = "";
break;
- case "Tabmix:sendDOMTitleChanged":
+ }
+ case "Tabmix:sendDOMTitleChanged": {
// workaround for bug 1081891
let title = content.document.title;
if (title)
sendAsyncMessage("DOMTitleChanged", {title: title});
break;
- case "Tabmix:updateHistoryTitle":
+ }
+ case "Tabmix:updateHistoryTitle": {
let history = docShell.QueryInterface(Ci.nsIWebNavigation).sessionHistory;
TabmixUtils.updateHistoryTitle(history, data.title);
break;
- case "Tabmix:collectScrollPosition":
+ }
+ case "Tabmix:collectScrollPosition": {
let scroll = {scrollX: content.scrollX,
scrollY: content.scrollY};
sendAsyncMessage("Tabmix:updateScrollPosition", {scroll: scroll});
break;
- case "Tabmix:setScrollPosition":
+ }
+ case "Tabmix:setScrollPosition": {
let {x, y} = data;
content.scrollTo(x, y);
break;
- case "Tabmix:collectReloadData":
+ }
+ case "Tabmix:collectReloadData": {
let json = {scrollX: content.scrollX,
scrollY: content.scrollY,
postData: null};
@@ -119,13 +126,16 @@ var TabmixContentHandler = {
}
sendAsyncMessage("Tabmix:reloadTab", json);
break;
- case "Tabmix:isFrameInContent":
+ }
+ case "Tabmix:isFrameInContent": {
let result = LinkNodeUtils.isFrameInContent(content, data.href, data.name);
sendAsyncMessage("Tabmix:isFrameInContentResult", {result: result});
break;
- case "Tabmix:collectOpener":
+ }
+ case "Tabmix:collectOpener": {
sendSyncMessage("Tabmix:getOpener", {}, {opener: content.opener});
break;
+ }
}
},
diff --git a/chrome/content/links/userInterface.js b/chrome/content/links/userInterface.js
index 16a7622..eaf5783 100644
--- a/chrome/content/links/userInterface.js
+++ b/chrome/content/links/userInterface.js
@@ -115,12 +115,13 @@ function TMP_BrowserOpenTab(aTab, replaceLastTab) {
var currentURI = gBrowser.currentURI;
url = currentURI ? currentURI.spec : newTabUrl;
break;
- case 3 : // duplicate tab
+ case 3 : { // duplicate tab
let currentUrl = gBrowser.currentURI.spec;
let newTab = gBrowser.duplicateTab(selectedTab, null, null, null, true);
Tabmix.clearUrlBar(newTab, currentUrl, true);
return newTab;
- case 4 : // user url
+ }
+ case 4 : {// user url
let prefName = replaceLastTab ? "extensions.tabmix.replaceLastTabWith.newtab.url" :
TabmixSvc.newtabUrl;
try {
@@ -134,6 +135,7 @@ function TMP_BrowserOpenTab(aTab, replaceLastTab) {
if (!url)
url = newTabUrl;
break;
+ }
default:
url = newTabUrl;
}
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index cf5b7e1..6fdd079 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -1412,7 +1412,7 @@ var tablib = { // eslint-disable-line
return currentIndex === 0 ? 1 : currentIndex - 1;
case 3: // last tab
return currentIndex == l - 1 ? currentIndex - 1 : l - 1;
- case 6: // last opened
+ case 6: {// last opened
let lastTabIndex, maxID = -1;
tabs.forEach(function(tab, index) {
if (tab == oldTab)
@@ -1427,12 +1427,14 @@ var tablib = { // eslint-disable-line
}
});
return lastTabIndex;
- case 4: // last selected
+ }
+ case 4: {// last selected
let tempIndex = this.previousTabIndex(oldTab, tabs);
// if we don't find last selected we fall back to default
if (tempIndex > -1)
return tempIndex;
/* falls through */
+ }
case 2: // opener / right (default )
case 5: // right tab
/* falls through */
diff --git a/chrome/content/places/places.js b/chrome/content/places/places.js
index 53a3666..842f116 100644
--- a/chrome/content/places/places.js
+++ b/chrome/content/places/places.js
@@ -174,7 +174,7 @@ var TMP_Places = {
getPrefByDocumentURI: function(aWindow) {
switch (aWindow.document.documentURI) {
- case "chrome://browser/content/places/places.xul":
+ case "chrome://browser/content/places/places.xul": {
let history = PlacesUIUtils.getString("OrganizerQueryHistory");
let historyId = PlacesUIUtils.leftPaneQueries[history];
let node = PlacesOrganizer._places.selectedNode;
@@ -183,6 +183,7 @@ var TMP_Places = {
if (!historySelected)
return this.prefBookmark;
/* falls through */
+ }
case "chrome://browser/content/history/history-panel.xul":
return this.prefHistory;
case "chrome://browser/content/browser.xul":
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index 6b7a5ac..3b1b8b6 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -675,13 +675,14 @@ Tabmix.tabsUtils = {
if (this.tabBar.useTabmixDragstart(aEvent))
TMP_tabDNDObserver.onDragStart(aEvent);
break;
- case "dragover":
+ case "dragover": {
let target = aEvent.target.localName;
if (target != "tab" && target != "tabs")
return;
if (this.tabBar.useTabmixDnD(aEvent))
TMP_tabDNDObserver.onDragOver(aEvent);
break;
+ }
case "drop":
if (this.tabBar.useTabmixDnD(aEvent))
TMP_tabDNDObserver.onDrop(aEvent);
@@ -1175,7 +1176,7 @@ var gTMPprefObserver = {
case "extensions.tabmix.tabbar.click_dragwindow":
document.getElementById("TabsToolbar")._dragBindingAlive = Services.prefs.getBoolPref(prefName);
/* falls through */
- case "extensions.tabmix.tabbar.dblclick_changesize":
+ case "extensions.tabmix.tabbar.dblclick_changesize": {
let dragwindow = Tabmix.prefs.getBoolPref("tabbar.click_dragwindow");
let changesize = Tabmix.prefs.getBoolPref("tabbar.dblclick_changesize");
if (!dragwindow && changesize) {
@@ -1184,10 +1185,11 @@ var gTMPprefObserver = {
}
TabmixTabClickOptions.toggleEventListener(dragwindow && !changesize);
break;
+ }
case "extensions.tabmix.lockallTabs":
TabmixTabbar.lockallTabs = Services.prefs.getBoolPref(prefName);
/* falls through */
- case "extensions.tabmix.lockAppTabs":
+ case "extensions.tabmix.lockAppTabs": {
if (!Tabmix.prefs.getBoolPref("updateOpenedTabsLockState"))
break;
let updatePinned = prefName == "extensions.tabmix.lockAppTabs";
@@ -1215,14 +1217,16 @@ var gTMPprefObserver = {
// force Sessionstore to save our changes
TabmixSvc.SessionStore.saveStateDelayed(window);
break;
+ }
case "extensions.tabmix.extraIcons.autoreload":
case "extensions.tabmix.extraIcons.protected":
case "extensions.tabmix.extraIcons.locked":
- case "extensions.tabmix.extraIcons.notpinned":
+ case "extensions.tabmix.extraIcons.notpinned": {
let addAtt = Services.prefs.getBoolPref(prefName);
let name = prefName.substr(prefName.lastIndexOf(".") + 1);
Tabmix.setAttributeList(gBrowser.tabContainer, "tabmix_icons", name, addAtt);
break;
+ }
case "extensions.tabmix.dblClickTab":
case "extensions.tabmix.middleClickTab":
case "extensions.tabmix.ctrlClickTab":
@@ -1258,7 +1262,7 @@ var gTMPprefObserver = {
this.updateStyleAttributes();
break;
case "browser.tabs.tabMaxWidth":
- case "browser.tabs.tabMinWidth":
+ case "browser.tabs.tabMinWidth": {
var currentVisible = Tabmix.tabsUtils.isElementVisible(gBrowser.mCurrentTab);
let tabMaxWidth = Math.max(16, Services.prefs.getIntPref("browser.tabs.tabMaxWidth"));
let tabMinWidth = Math.max(16, Services.prefs.getIntPref("browser.tabs.tabMinWidth"));
@@ -1293,6 +1297,7 @@ var gTMPprefObserver = {
});
}
break;
+ }
case "browser.tabs.tabClipWidth":
gBrowser.tabContainer.mTabClipWidth = Services.prefs.getIntPref(prefName);
gBrowser.tabContainer.adjustTabstrip();
@@ -1335,7 +1340,7 @@ var gTMPprefObserver = {
}
break;
case "extensions.tabmix.tabs.closeButtons.onLeft":
- case "extensions.classicthemerestorer.closeonleft":
+ case "extensions.classicthemerestorer.closeonleft": {
// let Classic theme restorer control close tab button placement when
// the default theme is in use.
if (Tabmix.extensions.ctr &&
@@ -1352,6 +1357,7 @@ var gTMPprefObserver = {
let onLeft = Tabmix.defaultCloseButtons && Services.prefs.getBoolPref(prefName);
gBrowser.tabContainer.setAttribute("closebuttons-side", onLeft ? "left" : "right");
break;
+ }
case "extensions.tabmix.tabs.closeButtons.enable":
prefValue = Services.prefs.getBoolPref(prefName);
Tabmix.tabsUtils.closeButtonsEnabled = prefValue;
@@ -1376,7 +1382,7 @@ var gTMPprefObserver = {
else if (Services.prefs.getIntPref("browser.sessionstore.max_tabs_undo") === 0)
Services.prefs.clearUserPref("browser.sessionstore.max_tabs_undo");
break;
- case "browser.sessionstore.max_tabs_undo":
+ case "browser.sessionstore.max_tabs_undo": {
// Firefox's sessionStore mainain the right amount
prefValue = Services.prefs.getIntPref(prefName);
if (Tabmix.prefs.getBoolPref("undoClose") != (prefValue > 0))
@@ -1384,6 +1390,7 @@ var gTMPprefObserver = {
let state = prefValue === 0 || undefined;
TMP_ClosedTabs.setButtonDisableState(state);
break;
+ }
case "browser.warnOnRestart":
case "browser.warnOnQuit":
case "browser.sessionstore.resume_from_crash":
@@ -1448,7 +1455,7 @@ var gTMPprefObserver = {
case "extensions.tabmix.reloadEvery.onReloadButton":
this.showReloadEveryOnReloadButton();
break;
- case "extensions.tabmix.tabBarMaxRow":
+ case "extensions.tabmix.tabBarMaxRow": {
var tabBar = gBrowser.tabContainer;
let row = Tabmix.prefs.getIntPref("tabBarMaxRow");
if (row < 2) {
@@ -1471,6 +1478,7 @@ var gTMPprefObserver = {
}
TabmixTabbar.updateBeforeAndAfter();
break;
+ }
case "extensions.tabmix.pinnedTabScroll":
gBrowser.tabContainer._positionPinnedTabs();
break;
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 9019266..bdfa126 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -304,7 +304,7 @@ var TMP_eventListener = {
case "unload":
this.onWindowClose(aEvent);
break;
- case "fullscreen":
+ case "fullscreen": {
let enterFS = window.fullScreen;
// Until Firefox 41 (Bug 1161802 part 2) we get the fullscreen event
// before the window transitions into or out of FS mode.
@@ -312,6 +312,7 @@ var TMP_eventListener = {
enterFS = !enterFS;
this.onFullScreen(enterFS);
break;
+ }
case "PrivateTab:PrivateChanged":
TabmixSessionManager.privateTabChanged(aEvent);
break;
@@ -522,11 +523,12 @@ var TMP_eventListener = {
case "CrystalFox_Qute-BigRedBrent":
tabBar.setAttribute("tabmix_skin", "CrystalFox");
break;
- case "Vista-aero":
+ case "Vista-aero": {
let rightBox = document.getElementById("myTabBarRightBox");
if (rightBox)
rightBox.setAttribute("vista_aero", true);
break;
+ }
case "classiccompact":
tabBar.setAttribute("tabmix_skin", "classiccompact");
break;
diff --git a/modules/Utils.jsm b/modules/Utils.jsm
index ad2e4b6..dfa51f1 100644
--- a/modules/Utils.jsm
+++ b/modules/Utils.jsm
@@ -70,12 +70,13 @@ this.TabmixUtils = {
tab = win.gBrowser.getTabForBrowser(browser);
win.TabmixSessionManager.updateScrollPosition(tab, message.data.scroll);
break;
- case "Tabmix:reloadTab":
+ case "Tabmix:reloadTab": {
let postData = message.data.postData;
if (postData)
message.data.postData = this.makeInputStream(postData);
AutoReload.reloadRemoteTab(browser, message.data);
break;
+ }
case "Tabmix:getOpener":
win = browser.ownerDocument.defaultView;
tab = win.gBrowser.getTabForBrowser(browser);
--
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