[Pkg-mozext-commits] [tabmixplus] 14/147: Eslint version 3.9.0 fixed indent rule to support multiline array statements and fixed no-useless-escape false negative in regexes
David Prévot
taffit at moszumanska.debian.org
Sat Aug 5 15:27:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit f9a889399899523361915666a510aec772511862
Author: onemen <tabmix.onemen at gmail.com>
Date: Sat Oct 29 22:34:34 2016 +0300
Eslint version 3.9.0 fixed indent rule to support multiline array statements and fixed no-useless-escape false negative in regexes
---
chrome/content/changecode.js | 2 +-
chrome/content/extensions/extensions.js | 6 ++--
chrome/content/minit/tablib.js | 4 +--
.../preferences/overlay/preferencesOverlay.js | 2 +-
chrome/content/preferences/preferences.js | 6 ++--
chrome/content/scripts/content.js | 2 +-
chrome/content/session/session.js | 38 +++++++++++-----------
chrome/content/tab/tab.js | 34 +++++++++----------
chrome/content/utils.js | 6 ++--
modules/ContentClick.jsm | 2 +-
modules/Services.jsm | 2 +-
modules/Shortcuts.jsm | 2 +-
modules/extensions/CompatibilityCheck.jsm | 2 +-
13 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/chrome/content/changecode.js b/chrome/content/changecode.js
index 037eba2..25f9003 100644
--- a/chrome/content/changecode.js
+++ b/chrome/content/changecode.js
@@ -56,7 +56,7 @@ Tabmix.changeCode = function(aParent, afnName, aOptions) {
if (!doReplace)
return this;
if (flags && typeof substr == "string")
- substr = new RegExp(substr.replace(/[{[(\\^.$|?*+\/)\]}]/g, "\\$&"), flags);
+ substr = new RegExp(substr.replace(/[{[(\\^.$|?*+/)\]}]/g, "\\$&"), flags);
}
var exist = typeof (substr) == "string" ? this.value.indexOf(substr) > -1 : substr.test(this.value);
diff --git a/chrome/content/extensions/extensions.js b/chrome/content/extensions/extensions.js
index 62ed8ef..3ed9b6e 100644
--- a/chrome/content/extensions/extensions.js
+++ b/chrome/content/extensions/extensions.js
@@ -539,8 +539,8 @@ TMP_extensionsCompatibility.wizzrss = {
var codeToReplace = /getContentBrowser\(\).loadURI|contentBrowser.loadURI/g;
const newCode = "TMP_extensionsCompatibility.wizzrss.openURI";
var _functions = ["addFeedbase", "validate", "gohome", "tryagain", "promptStuff",
- "doSearch", "viewLog", "renderItem", "playEnc", "renderAllEnc", "playAllEnc",
- "gotoLink", "itemLinkClick", "itemListClick"];
+ "doSearch", "viewLog", "renderItem", "playEnc", "renderAllEnc", "playAllEnc",
+ "gotoLink", "itemLinkClick", "itemListClick"];
_functions.forEach(function(_function) {
if (_function in window)
@@ -741,7 +741,7 @@ TMP_extensionsCompatibility.treeStyleTab = {
).toCode();
// Added 2011-11-09, i'm not sure we really need it, Tabmix.loadTabs call gBrowser.loadTabs
Tabmix.changeCode(TabmixContext, "TabmixContext.openMultipleLinks")._replace(
- /(Tabmix.loadTabs\([^\)]+\);)/g,
+ /(Tabmix.loadTabs\([^)]+\);)/g,
'TreeStyleTabService.readyToOpenChildTab(gBrowser, true); $1 TreeStyleTabService.stopToOpenChildTab(gBrowser);'
).toCode();
}
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index fd18e64..e71a54a 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -1531,8 +1531,8 @@ var tablib = { // eslint-disable-line
var numProtected = protectedTabs.length;
var shouldPrompt = 0;
var prefs = ["extensions.tabmix.tabs.warnOnClose",
- "extensions.tabmix.protectedtabs.warnOnClose",
- "browser.tabs.warnOnClose"];
+ "extensions.tabmix.protectedtabs.warnOnClose",
+ "browser.tabs.warnOnClose"];
if (onExit) {
if (numTabs > 1 && Services.prefs.getBoolPref(prefs[2]))
shouldPrompt = 3;
diff --git a/chrome/content/preferences/overlay/preferencesOverlay.js b/chrome/content/preferences/overlay/preferencesOverlay.js
index a5ab07c..772484e 100644
--- a/chrome/content/preferences/overlay/preferencesOverlay.js
+++ b/chrome/content/preferences/overlay/preferencesOverlay.js
@@ -27,7 +27,7 @@ var gTabMix_preferencesOverlay = {
if (TabmixSvc.version(260)) {
let boxes = ["tabmixplusBox", "btn_tabmixplus", "generalWindowOpenBox",
- "warnOnCloseWindow", "warnOnCloseProtected", "hideTabbarBox"];
+ "warnOnCloseWindow", "warnOnCloseProtected", "hideTabbarBox"];
boxes.forEach(function(id) {
let item = this.id(id);
item.removeAttribute("data-category");
diff --git a/chrome/content/preferences/preferences.js b/chrome/content/preferences/preferences.js
index d28a552..ba5bd43 100644
--- a/chrome/content/preferences/preferences.js
+++ b/chrome/content/preferences/preferences.js
@@ -345,9 +345,9 @@ function setPrefAfterImport(aPref) {
}
var sessionPrefs = ["browser.sessionstore.resume_from_crash",
- "browser.startup.page",
- "extensions.tabmix.sessions.manager",
- "extensions.tabmix.sessions.crashRecovery"];
+ "browser.startup.page",
+ "extensions.tabmix.sessions.manager",
+ "extensions.tabmix.sessions.crashRecovery"];
XPCOMUtils.defineLazyGetter(window, "gPreferenceList", function() {
// other settings not in extensions.tabmix. branch that we save
diff --git a/chrome/content/scripts/content.js b/chrome/content/scripts/content.js
index 587e7d3..5be79a5 100644
--- a/chrome/content/scripts/content.js
+++ b/chrome/content/scripts/content.js
@@ -368,7 +368,7 @@ TabmixClickEventHandler = {
// callers expect <a>-like elements.
// Note: makeURI() will throw if aUri is not a valid URI.
return [href ? BrowserUtils.makeURI(href, null, baseURI).spec : null, null,
- node && node.ownerDocument.nodePrincipal];
+ node && node.ownerDocument.nodePrincipal];
},
};
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 02a2f04..e5705b0 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -1274,21 +1274,21 @@ TabmixSessionManager = {
msg = TabmixSvc.getSMString("sm.addtoStartup.msg." + msgType) + "\n" +
label + "\n" + areYouSure + "\n\n" + chooseStartup;
buttons = [TabmixSvc.setLabel("sm.addtoStartup.button0"),
- TabmixSvc.setLabel("sm.addtoStartup.button1")].join("\n");
+ TabmixSvc.setLabel("sm.addtoStartup.button1")].join("\n");
break;
case "replaceSession":
title = TabmixSvc.getSMString("sm.replaceStartup.title");
msg = TabmixSvc.getSMString("sm.replaceStartup.msg") + "\n" +
label + "\n" + areYouSure + "\n\n" + chooseStartup;
buttons = [TabmixSvc.setLabel("sm.replaceStartup.button0"),
- TabmixSvc.setLabel("sm.replaceStartup.button1")].join("\n");
+ TabmixSvc.setLabel("sm.replaceStartup.button1")].join("\n");
break;
case "removeSavedSession":
title = TabmixSvc.getSMString("sm.removeStartup.title");
msg = TabmixSvc.getSMString("sm.removeStartup.msg0") + "\n" +
label + "\n" + areYouSure + "\n\n" + TabmixSvc.getSMString("sm.removeStartup.msg1");
buttons = [TabmixSvc.setLabel("sm.removeStartup.button0"),
- TabmixSvc.setLabel("sm.removeStartup.button1")].join("\n");
+ TabmixSvc.setLabel("sm.removeStartup.button1")].join("\n");
selectionFlag = Tabmix.SELECT_LASTSESSION;
break;
}
@@ -1435,7 +1435,7 @@ TabmixSessionManager = {
var msg = TabmixSvc.getSMString("sm.dontSaveBlank.msg");
var buttons = ["", TabmixSvc.setLabel("sm.button.continue")].join("\n");
Tabmix.promptService([Tabmix.BUTTON_CANCEL, Tabmix.HIDE_MENUANDTEXT,
- Tabmix.HIDE_CHECKBOX], [title, msg, "", "", buttons]);
+ Tabmix.HIDE_CHECKBOX], [title, msg, "", "", buttons]);
return false;
}
return true;
@@ -1501,13 +1501,13 @@ TabmixSessionManager = {
if (action == "rename") {
label = old;
buttons = [TabmixSvc.setLabel("sm.sessionName.button0"),
- TabmixSvc.setLabel("sm.sessionName.button1")].join("\n");
+ TabmixSvc.setLabel("sm.sessionName.button1")].join("\n");
actionFlag = Tabmix.DLG_RENAME;
} else {
label = action == "saveprevious" ? old : gBrowser.mCurrentTab.label;
buttons = [TabmixSvc.setLabel("sm.askBeforeSave.button0"),
- TabmixSvc.setLabel("sm.askBeforeSave.button1"),
- TabmixSvc.setLabel("sm.replaceStartup.button0") + "..."].join("\n");
+ TabmixSvc.setLabel("sm.askBeforeSave.button1"),
+ TabmixSvc.setLabel("sm.replaceStartup.button0") + "..."].join("\n");
actionFlag = Tabmix.DLG_SAVE;
}
label = label + "\n" + sessionList.list.join("\n");
@@ -1550,10 +1550,10 @@ TabmixSessionManager = {
getNameData: function(numWindows, numTabs) {
var d = new Date();
var date = [d.getFullYear(), '/', d.getMonth() < 9 ? "0" : "",
- d.getMonth() + 1, '/', d.getDate() < 10 ? "0" : "", d.getDate()].join('');
+ d.getMonth() + 1, '/', d.getDate() < 10 ? "0" : "", d.getDate()].join('');
var time = [d.getHours() < 10 ? "0" : "", d.getHours(), ':',
- d.getMinutes() < 10 ? "0" : "", d.getMinutes(), ':',
- d.getSeconds() < 10 ? "0" : "", d.getSeconds()].join('');
+ d.getMinutes() < 10 ? "0" : "", d.getMinutes(), ':',
+ d.getSeconds() < 10 ? "0" : "", d.getSeconds()].join('');
var empty = TabmixSvc.getSMString("sm.session.empty");
var T = TabmixSvc.getSMString("sm.session.tabs");
var W = TabmixSvc.getSMString("sm.session.windows");
@@ -1756,7 +1756,7 @@ TabmixSessionManager = {
var node = aMenuItem.parentNode.parentNode;
var result, title, msg;
var buttons = [TabmixSvc.setLabel("sm.removeStartup.button0"),
- TabmixSvc.setLabel("sm.removeStartup.button1")].join("\n");
+ TabmixSvc.setLabel("sm.removeStartup.button1")].join("\n");
if (node.hasAttribute("sessionmanager-menu")) {
title = TabmixSvc.getSMString("sm.removeAll.title.session");
msg = TabmixSvc.getSMString("sm.removeAll.msg0") + "\n\n";
@@ -1964,7 +1964,7 @@ TabmixSessionManager = {
}.bind(this);
let backups = [TabmixSvc.getSMString("sm.tabview.backup.session"),
- TabmixSvc.getSMString("sm.tabview.backup.crashed")];
+ TabmixSvc.getSMString("sm.tabview.backup.crashed")];
for (let i = 0; i < count; i++) {
node = nodes[i];
name = this.getDecodedLiteralValue(node, "name");
@@ -2181,7 +2181,7 @@ TabmixSessionManager = {
if (this.enableManager && !isAllEmpty) {
msg += "\n\n" + TabmixSvc.getSMString("sm.afterCrash.msg1");
buttons = [TabmixSvc.setLabel("sm.afterCrash.button0"),
- TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
+ TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
this.promptService([Tabmix.BUTTON_OK, Tabmix.SHOW_MENULIST, Tabmix.HIDE_CHECKBOX, Tabmix.SELECT_CRASH],
[title, msg, "", "", buttons], window, callBack);
} else {
@@ -2191,7 +2191,7 @@ TabmixSessionManager = {
else
msg += "\n" + TabmixSvc.getSMString("sm.afterCrash.msg4");
buttons = [TabmixSvc.setLabel("sm.afterCrash.button0.crashed"),
- TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
+ TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
this.promptService([Tabmix.BUTTON_OK, Tabmix.HIDE_MENUANDTEXT, chkBoxState],
[title, msg, "", chkBoxLabel, buttons], window, callBack);
this.callBackData.label = this.gSessionPath[3];
@@ -2200,7 +2200,7 @@ TabmixSessionManager = {
msg += " " + TabmixSvc.getSMString("sm.afterCrash.msg5") + "\n\n" +
TabmixSvc.getSMString("sm.afterCrash.msg1");
buttons = [TabmixSvc.setLabel("sm.afterCrash.button0"),
- TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
+ TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
this.promptService([Tabmix.BUTTON_OK, Tabmix.SHOW_MENULIST, Tabmix.HIDE_CHECKBOX, Tabmix.SELECT_DEFAULT],
[title, msg, "", "", buttons], window, callBack);
} else if (closedWinList !== 0) {
@@ -2212,7 +2212,7 @@ TabmixSessionManager = {
msg += "\n\n" + TabmixSvc.getSMString("sm.afterCrash.msg7") + " " +
TabmixSvc.getSMString("sm.afterCrash.msg8") + ":";
buttons = [TabmixSvc.setLabel("sm.afterCrash.button0"),
- TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
+ TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
this.promptService([Tabmix.BUTTON_OK, Tabmix.SHOW_MENULIST, chkBoxState, Tabmix.SHOW_CLOSED_WINDOW_LIST],
[title, msg, "", chkBoxLabel, buttons], window, callBack);
this.callBackData.whatToLoad = "closedwindow";
@@ -2388,7 +2388,7 @@ TabmixSessionManager = {
if (!loadSessionIsValid) msg += TabmixSvc.getSMString("sm.start.msg2");
msg += "\n\n" + TabmixSvc.getSMString("sm.afterCrash.msg1");
buttons = [TabmixSvc.setLabel("sm.afterCrash.button0"),
- TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
+ TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
let callBack = function(aResult) {
this.onFirstWindowPromptCallBack(aResult);
}.bind(this);
@@ -3508,7 +3508,7 @@ TabmixSessionManager = {
// if we need to remove extra tabs make sure they are not protected
let attributes = ["protected", "fixed-label", "label-uri", "tabmix_bookmarkId",
- "pending", "hidden", "image"];
+ "pending", "hidden", "image"];
// remove visited and tabmix_selectedID from all tabs but the current
if (aTab != gBrowser.mCurrentTab)
attributes = attributes.concat(["visited", "tabmix_selectedID"]);
@@ -3756,7 +3756,7 @@ TabmixSessionManager = {
// and makes the alphabetical order of multiple backup files more useful.
var d = new Date();
var date = [d.getFullYear(), '-', d.getMonth() < 9 ? "0" : "", d.getMonth() + 1, '-',
- d.getDate() < 10 ? "0" : "", d.getDate()].join('');
+ d.getDate() < 10 ? "0" : "", d.getDate()].join('');
var backupFilename = "tabmix_sessions-" + date + ".rdf";
var backupFile = null;
if (!aForceArchive) {
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index f2276d7..8961820 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -649,9 +649,9 @@ Tabmix.tabsUtils = {
this._show_newtabbutton = "aftertabs";
let attr = ["notpinned", "autoreload", "protected",
- "locked"].filter(function(att) {
- return Tabmix.prefs.getBoolPref("extraIcons." + att);
- });
+ "locked"].filter(function(att) {
+ return Tabmix.prefs.getBoolPref("extraIcons." + att);
+ });
if (attr.length)
this.tabBar.setAttribute("tabmix_icons", attr.join(" "));
@@ -1236,17 +1236,17 @@ gTMPprefObserver = {
},
OBSERVING: ["extensions.tabmix.",
- "browser.tabs.tabMinWidth",
- "browser.tabs.tabMaxWidth",
- "browser.tabs.tabClipWidth",
- "browser.sessionstore.max_tabs_undo",
- "browser.warnOnQuit",
- "browser.sessionstore.resume_from_crash",
- "browser.startup.page",
- "browser.link.open_newwindow.override.external",
- "browser.link.open_newwindow.restriction",
- "browser.link.open_newwindow",
- "browser.ctrlTab.previews"],
+ "browser.tabs.tabMinWidth",
+ "browser.tabs.tabMaxWidth",
+ "browser.tabs.tabClipWidth",
+ "browser.sessionstore.max_tabs_undo",
+ "browser.warnOnQuit",
+ "browser.sessionstore.resume_from_crash",
+ "browser.startup.page",
+ "browser.link.open_newwindow.override.external",
+ "browser.link.open_newwindow.restriction",
+ "browser.link.open_newwindow",
+ "browser.ctrlTab.previews"],
// removes the observer-object from service -- called when the window is no longer open
removeObservers: function() {
@@ -1952,8 +1952,8 @@ gTMPprefObserver = {
// set bold, italic and underline only when we control the style
// to override theme default rule if exist
attribValue = [prefValues.bold ? "bold" : "not-bold",
- prefValues.italic ? "italic" : "not-italic",
- prefValues.underline ? "underline" : "not-underline"
+ prefValues.italic ? "italic" : "not-italic",
+ prefValues.underline ? "underline" : "not-underline"
];
if (prefValues.text)
attribValue.push("text");
@@ -2654,7 +2654,7 @@ gTMPprefObserver = {
updateTabClickingOptions: function() {
var c = ["dblClickTab", "middleClickTab", "ctrlClickTab", "shiftClickTab", "altClickTab",
- "dblClickTabbar", "middleClickTabbar", "ctrlClickTabbar", "shiftClickTabbar", "altClickTabbar"];
+ "dblClickTabbar", "middleClickTabbar", "ctrlClickTabbar", "shiftClickTabbar", "altClickTabbar"];
for (let i = 0; i < c.length; i++)
this.blockTabClickingOptions("extensions.tabmix." + c[i]);
},
diff --git a/chrome/content/utils.js b/chrome/content/utils.js
index faafbb8..ce2d13c 100644
--- a/chrome/content/utils.js
+++ b/chrome/content/utils.js
@@ -254,9 +254,9 @@ var Tabmix = {
}.bind(this), false);
var methods = ["changeCode", "setNewFunction", "nonStrictMode",
- "getObject", "log", "getCallerNameByIndex", "callerName",
- "clog", "isCallerInList", "callerTrace",
- "obj", "assert", "trace", "reportError"];
+ "getObject", "log", "getCallerNameByIndex", "callerName",
+ "clog", "isCallerInList", "callerTrace",
+ "obj", "assert", "trace", "reportError"];
methods.forEach(function(id) {
this[id] = function TMP_console_wrapper() {
return this._getMethod(id, arguments);
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index d91a280..dce4c81 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -943,7 +943,7 @@ ContentClickInternal = {
return true;
let _list = ["/preferences", "/advanced_search", "/language_tools", "/profiles",
- "/accounts/Logout", "/accounts/ServiceLogin", "/u/2/stream/all"];
+ "/accounts/Logout", "/accounts/ServiceLogin", "/u/2/stream/all"];
let testPathname = _list.indexOf(node.pathname) > -1;
if (testPathname)
diff --git a/modules/Services.jsm b/modules/Services.jsm
index 1a4ceba..1d08a1d 100644
--- a/modules/Services.jsm
+++ b/modules/Services.jsm
@@ -161,7 +161,7 @@ this.TabmixSvc = {
windowStartup: {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ Ci.nsISupportsWeakReference]),
_initialized: false,
init: function(aWindow) {
// windowStartup must only be called once for each window
diff --git a/modules/Shortcuts.jsm b/modules/Shortcuts.jsm
index d75bc07..9fc2cb2 100644
--- a/modules/Shortcuts.jsm
+++ b/modules/Shortcuts.jsm
@@ -381,7 +381,7 @@ this.Shortcuts = {
if (!value)
return "";
return [(value.disabled ? "d&" : "") + (value.key || value.keycode),
- value.modifiers].join(" ").replace(/[\s|;]$/, "");
+ value.modifiers].join(" ").replace(/[\s|;]$/, "");
},
validateKey: function validateKey(key) {
diff --git a/modules/extensions/CompatibilityCheck.jsm b/modules/extensions/CompatibilityCheck.jsm
index 052736a..4a60c66 100644
--- a/modules/extensions/CompatibilityCheck.jsm
+++ b/modules/extensions/CompatibilityCheck.jsm
@@ -115,7 +115,7 @@ CompatibilityCheck.prototype = {
TabmixSvc.getString("incompatible.msg1") + "\n\n" + outStr + "\n\n";
var chkBoxLabel = TabmixSvc.getString("incompatible.chkbox.label");
var buttons = [TabmixSvc.setLabel("incompatible.button0"),
- TabmixSvc.setLabel("incompatible.button1")];
+ TabmixSvc.setLabel("incompatible.button1")];
buttons.push(TabmixSvc.setLabel("incompatible.button2"));
// make promptService non modal on startup
--
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