[Pkg-mozext-commits] [tabmixplus] 15/147: Update Eslint indent rule, apply CallExpression and FunctionExpression options
David Prévot
taffit at moszumanska.debian.org
Sat Aug 5 15:27:32 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 4da5e675b1e7da4c7391ba4f757d9961fca6ffdb
Author: onemen <tabmix.onemen at gmail.com>
Date: Sat Oct 29 23:15:28 2016 +0300
Update Eslint indent rule, apply CallExpression and FunctionExpression options
---
.eslintrc.js | 8 ++++++-
chrome/content/click/click.js | 22 ++++++++---------
chrome/content/links/contentLinks.js | 2 +-
chrome/content/links/setup.js | 16 ++++++-------
chrome/content/links/userInterface.js | 2 +-
chrome/content/minit/minit.js | 10 ++++----
chrome/content/minit/tablib.js | 28 +++++++++++-----------
chrome/content/places/places.js | 2 +-
chrome/content/preferences/appearance.js | 2 +-
chrome/content/preferences/links.js | 2 +-
.../preferences/overlay/overlaySanitizeUI.js | 14 +++++------
chrome/content/preferences/overlay/preferences.xml | 4 ++--
chrome/content/preferences/preferences.js | 2 +-
chrome/content/preferences/shortcuts.xml | 2 +-
chrome/content/scripts/content.js | 2 +-
chrome/content/session/session.js | 14 +++++------
chrome/content/tab/scrollbox.xml | 2 +-
chrome/content/tab/tab.js | 20 ++++++++--------
chrome/content/tab/tabbrowser_4.xml | 2 +-
chrome/content/tabmix.js | 4 ++--
chrome/content/utils.js | 4 ++--
modules/AsyncUtils.jsm | 2 +-
modules/AutoReload.jsm | 4 ++--
modules/ContentClick.jsm | 4 ++--
modules/ContextMenu.jsm | 6 ++---
modules/MergeWindows.jsm | 12 +++++-----
modules/NewTabURL.jsm | 8 +++----
modules/RenameTab.jsm | 6 ++---
modules/Shortcuts.jsm | 2 +-
modules/Slideshow.jsm | 2 +-
modules/TabGroupsMigrator.jsm | 12 +++++-----
modules/log.jsm | 2 +-
32 files changed, 115 insertions(+), 109 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index cad7ef7..839e617 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -185,7 +185,13 @@ module.exports = {
"id-blacklist": 0,
"id-length": 0,
"id-match": 0,
- "indent": [2, 2, {"SwitchCase": 1, "VariableDeclarator": {"var": 2, "let": 2, "const": 3}}],
+ "indent": [2, 2, {
+ "CallExpression": {"arguments": 1},
+ "FunctionDeclaration": {"body": 1, "parameters": "first"},
+ "FunctionExpression": {"body": 1, "parameters": "first"},
+ "SwitchCase": 1,
+ "VariableDeclarator": {"var": 2, "let": 2, "const": 3}
+ }],
"init-declarations": 0,
"jsx-quotes": 0,
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index e864ba1..f6ba97f 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -345,8 +345,8 @@ var TabmixContext = {
var aFunction = "createTabbarMenu" in IeTab.prototype ? "createTabbarMenu" : "init";
if (aFunction in IeTab.prototype) {
Tabmix.changeCode(IeTab.prototype, "IeTab.prototype." + aFunction)._replace(
- 'tabbarMenu.insertBefore(document.getElementById("ietab-tabbar-sep"), separator);',
- 'separator = document.getElementById("tm-separator-3"); $&'
+ 'tabbarMenu.insertBefore(document.getElementById("ietab-tabbar-sep"), separator);',
+ 'separator = document.getElementById("tm-separator-3"); $&'
).toCode();
}
}
@@ -442,8 +442,8 @@ var TabmixContext = {
Tabmix.showItem("context_openTabInWindow", Tabmix.prefs.getBoolPref("detachTabMenu") && !Tabmix.singleWindowMode);
if (Tabmix.isVersion(320)) {
Tabmix.showItem("context_openNonRemoteWindow",
- Tabmix.prefs.getBoolPref("tabcontext.openNonRemoteWindow") &&
- !Tabmix.singleWindowMode && gMultiProcessBrowser);
+ Tabmix.prefs.getBoolPref("tabcontext.openNonRemoteWindow") &&
+ !Tabmix.singleWindowMode && gMultiProcessBrowser);
}
if (Tabmix.isVersion(430)) {
@@ -460,9 +460,9 @@ var TabmixContext = {
Tabmix.showItem(tabViewMenu, Tabmix.prefs.getBoolPref("moveToGroup") && !aTab.pinned);
});
Tabmix.showItem("tm-mergeWindowsTab",
- Tabmix.prefs.getBoolPref("showMergeWindow") &&
- (!Tabmix.singleWindowMode ||
- (Tabmix.singleWindowMode && !isOneWindow)));
+ Tabmix.prefs.getBoolPref("showMergeWindow") &&
+ (!Tabmix.singleWindowMode ||
+ (Tabmix.singleWindowMode && !isOneWindow)));
var showRenameTabMenu = Tabmix.prefs.getBoolPref("renameTabMenu");
Tabmix.showItem("tm-renameTab", showRenameTabMenu);
Tabmix.showItem("tm-copyTabUrl", Tabmix.prefs.getBoolPref("copyTabUrlMenu"));
@@ -539,7 +539,7 @@ var TabmixContext = {
Tabmix.setItem("context_closeOtherTabs", "disabled", noTabsToClose);
Tabmix.setItem("context_closeTabsToTheEnd", "disabled", cIndex == tabsCount - 1 || noTabsToClose);
Tabmix.setItem("tm-closeLeftTabs", "disabled",
- cIndex === 0 || aTab.pinned || Tabmix.visibleTabs.previous(aTab).pinned);
+ cIndex === 0 || aTab.pinned || Tabmix.visibleTabs.previous(aTab).pinned);
var closeTabsEmpty = TMP_ClosedTabs.count < 1;
Tabmix.setItem("context_undoCloseTab", "disabled", closeTabsEmpty);
@@ -704,11 +704,11 @@ var TabmixContext = {
Tabmix.showItem(mergeMenu, !contentClick && !isOneWindow && Tabmix.prefs.getBoolPref("mergeWindowContent"));
this._showAutoReloadMenu("tm-autoreload_menu", "autoReloadContent",
- !contentClick && !gContextMenu.isTextSelected);
+ !contentClick && !gContextMenu.isTextSelected);
Tabmix.showItem("tm-openAllLinks",
- Tabmix.prefs.getBoolPref("openAllLinks") &&
- !TabmixContext.openMultipleLinks(true));
+ Tabmix.prefs.getBoolPref("openAllLinks") &&
+ !TabmixContext.openMultipleLinks(true));
// show/hide menuseparator
var undoCloseSep = document.getElementById("tm-content-undoCloseSep");
diff --git a/chrome/content/links/contentLinks.js b/chrome/content/links/contentLinks.js
index 8622448..889fbf6 100644
--- a/chrome/content/links/contentLinks.js
+++ b/chrome/content/links/contentLinks.js
@@ -76,6 +76,6 @@ Tabmix.contentAreaClick = {
*/
_contentLinkClick: function TMP__contentLinkClick(event) {
Tabmix.ContentClick.contentLinkClick(event,
- gBrowser.selectedBrowser, document.commandDispatcher.focusedWindow);
+ gBrowser.selectedBrowser, document.commandDispatcher.focusedWindow);
}
};
diff --git a/chrome/content/links/setup.js b/chrome/content/links/setup.js
index 14eaac9..c9f3a7d 100644
--- a/chrome/content/links/setup.js
+++ b/chrome/content/links/setup.js
@@ -27,14 +27,14 @@ Tabmix.linkHandling_init = function TMP_TBP_init() {
"_QuietUrlPopupClickOld" : "PopupAutoCompleteRichResult.onPopupClick";
let n = '\n ';
this.changeCode(autoComplete, fn)._replace(
- /openUILink\(url, aEvent.*\);/,
- 'var tabmixOptions = typeof options == "object" ? options : {};' + n +
- 'var isBlankTab = gBrowser.isBlankNotBusyTab(gBrowser.mCurrentTab);' + n +
- 'var where = isBlankTab ? "current" : whereToOpenLink(aEvent);' + n +
- 'var pref = "extensions.tabmix.loadUrlInBackground";' + n +
- 'tabmixOptions.inBackground = Services.prefs.getBoolPref(pref);' + n +
- 'tabmixOptions.initiatingDoc = aEvent ? aEvent.target.ownerDocument : null;' + n +
- 'openUILinkIn(url, where, tabmixOptions);'
+ /openUILink\(url, aEvent.*\);/,
+ 'var tabmixOptions = typeof options == "object" ? options : {};' + n +
+ 'var isBlankTab = gBrowser.isBlankNotBusyTab(gBrowser.mCurrentTab);' + n +
+ 'var where = isBlankTab ? "current" : whereToOpenLink(aEvent);' + n +
+ 'var pref = "extensions.tabmix.loadUrlInBackground";' + n +
+ 'tabmixOptions.inBackground = Services.prefs.getBoolPref(pref);' + n +
+ 'tabmixOptions.initiatingDoc = aEvent ? aEvent.target.ownerDocument : null;' + n +
+ 'openUILinkIn(url, where, tabmixOptions);'
).toCode();
}
}
diff --git a/chrome/content/links/userInterface.js b/chrome/content/links/userInterface.js
index feea839..191c7c7 100644
--- a/chrome/content/links/userInterface.js
+++ b/chrome/content/links/userInterface.js
@@ -28,7 +28,7 @@ Tabmix.openOptionsDialog = function TMP_openDialog(panel) {
(appearanceWin || filetypeWin || promptWin || tabmixOptionsWin).focus();
} else {
window.openDialog("chrome://tabmixplus/content/preferences/preferences.xul", "Tab Mix Plus",
- "chrome,titlebar,toolbar,close,dialog=no,centerscreen", panel || null);
+ "chrome,titlebar,toolbar,close,dialog=no,centerscreen", panel || null);
}
};
diff --git a/chrome/content/minit/minit.js b/chrome/content/minit/minit.js
index d6a40de..7e2cd06 100644
--- a/chrome/content/minit/minit.js
+++ b/chrome/content/minit/minit.js
@@ -433,7 +433,7 @@ var TMP_tabDNDObserver = {
// ensure that the remoteness of the newly created browser is
// appropriate for the URL of the tab being dragged in.
gBrowser.updateBrowserRemotenessByURL(newBrowser,
- draggedBrowserURL);
+ draggedBrowserURL);
}
// Stop the about:blank load
@@ -586,9 +586,9 @@ var TMP_tabDNDObserver = {
var winWidth = Math.min(window.outerWidth, availWidth.value);
var winHeight = Math.min(window.outerHeight, availHeight.value);
var left = Math.min(Math.max(eX - draggedTab._dragData.offsetX, availX.value),
- availX.value + availWidth.value - winWidth);
+ availX.value + availWidth.value - winWidth);
var top = Math.min(Math.max(eY - draggedTab._dragData.offsetY, availY.value),
- availY.value + availHeight.value - winHeight);
+ availY.value + availHeight.value - winHeight);
delete draggedTab._dragData;
@@ -1216,7 +1216,7 @@ Tabmix.navToolbox = {
event.altKey && !isTabEmpty(gBrowser.selectedTab);
let where = "current";
let loadNewTab = Tabmix.whereToOpen("extensions.tabmix.opentabfor.urlbar",
- altEnter).inNew && !(/^ *javascript:/.test(this.value));
+ altEnter).inNew && !(/^ *javascript:/.test(this.value));
if (isMouseEvent || altEnter || loadNewTab) {
// Use the standard UI link behaviors for clicks or Alt+Enter
where = "tab";
@@ -1424,7 +1424,7 @@ Tabmix.navToolbox = {
// alltabs-popup fix visibility for multi-row
Tabmix.setNewFunction(alltabsPopup, "_updateTabsVisibilityStatus",
- TabmixAllTabs._updateTabsVisibilityStatus);
+ TabmixAllTabs._updateTabsVisibilityStatus);
}
},
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index e71a54a..70dd4da 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -760,8 +760,8 @@ var tablib = { // eslint-disable-line
'$&' +
'if (where == "current" && Tabmix.whereToOpen(false).inNew) where = "tab";'
)._replace(
- 'loadOneOrMoreURIs(homePage);',
- '$& \
+ 'loadOneOrMoreURIs(homePage);',
+ '$& \
gBrowser.ensureTabIsVisible(gBrowser.selectedTab);'
).toCode();
}
@@ -1071,8 +1071,8 @@ var tablib = { // eslint-disable-line
};
Services.obs.addObserver(delayedStartupFinished,
- "browser-delayed-startup-finished",
- false);
+ "browser-delayed-startup-finished",
+ false);
}
};
@@ -1147,7 +1147,7 @@ var tablib = { // eslint-disable-line
// we only get here when it is safe to use contentWindowAsCPOW
// see TabmixContext.updateMainContextMenu
let result = Tabmix.ContentClick.getParamsForLink(json,
- target, linkURL, browser, gBrowser.selectedBrowser._contentWindow);
+ target, linkURL, browser, gBrowser.selectedBrowser._contentWindow);
return result._href && isValid(result._href) ? result._href : null;
}
return linkURL;
@@ -1394,7 +1394,7 @@ var tablib = { // eslint-disable-line
var temp_id, tempIndex = -1, max_id = 0;
var tabs = aTabs || this.visibleTabs;
var items = Array.prototype.filter.call(this.tabContainer.getElementsByAttribute("tabmix_selectedID", "*"),
- tab => !tab.hidden && !tab.closing);
+ tab => !tab.hidden && !tab.closing);
for (var i = 0; i < items.length; ++i) {
if (aTab && items[i] != aTab) {
temp_id = parseInt(items[i].getAttribute("tabmix_selectedID") || 0);
@@ -1650,14 +1650,14 @@ var tablib = { // eslint-disable-line
window.focus();
var promptService = Services.prompt;
var buttonPressed = promptService.confirmEx(window,
- bundle.getString("tabs.closeWarningTitle"),
- message,
- (promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_0) +
- (promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_1),
- buttonLabel,
- null, null,
- chkBoxLabel,
- warnOnClose);
+ bundle.getString("tabs.closeWarningTitle"),
+ message,
+ (promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_0) +
+ (promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_1),
+ buttonLabel,
+ null, null,
+ chkBoxLabel,
+ warnOnClose);
var reallyClose = (buttonPressed === 0);
// don't set the pref unless they press OK and it's false
if (reallyClose && !warnOnClose.value) {
diff --git a/chrome/content/places/places.js b/chrome/content/places/places.js
index 3472ac9..0f57573 100644
--- a/chrome/content/places/places.js
+++ b/chrome/content/places/places.js
@@ -588,7 +588,7 @@ TMP_Places.contextMenu = {
// update context menu for bookmarks manager and sidebar
// for bookmarks/places, history, sage and more.....
update: function TMP_contextMenu_update(open, openInWindow, openInPrivateWindow,
- openInTab, pref) {
+ openInTab, pref) {
// if all 4 is hidden... probably "Open all in Tabs" is visible
if (open.hidden && openInWindow.hidden && openInPrivateWindow.hidden &&
openInTab.hidden) {
diff --git a/chrome/content/preferences/appearance.js b/chrome/content/preferences/appearance.js
index b732c22..2fd7caf 100644
--- a/chrome/content/preferences/appearance.js
+++ b/chrome/content/preferences/appearance.js
@@ -166,7 +166,7 @@ var gAppearancePane = {
openAdvanceAppearance: function() {
window.openDialog("chrome://tabmixplus/content/preferences/subdialogs/pref-appearance.xul",
- "advanceAppearanceDialog", "modal,titlebar,toolbar,centerscreen");
+ "advanceAppearanceDialog", "modal,titlebar,toolbar,centerscreen");
}
};
diff --git a/chrome/content/preferences/links.js b/chrome/content/preferences/links.js
index 0c711ea..c0087f1 100644
--- a/chrome/content/preferences/links.js
+++ b/chrome/content/preferences/links.js
@@ -52,6 +52,6 @@ var gLinksPane = {
openFiletypeEditor: function() {
window.openDialog("chrome://tabmixplus/content/preferences/subdialogs/pref-filetype.xul",
- "filetypePrefsDialog", "modal,titlebar,toolbar,centerscreen");
+ "filetypePrefsDialog", "modal,titlebar,toolbar,centerscreen");
}
};
diff --git a/chrome/content/preferences/overlay/overlaySanitizeUI.js b/chrome/content/preferences/overlay/overlaySanitizeUI.js
index 4bd1531..3c0eda8 100644
--- a/chrome/content/preferences/overlay/overlaySanitizeUI.js
+++ b/chrome/content/preferences/overlay/overlaySanitizeUI.js
@@ -91,8 +91,8 @@ Tabmix.setSanitizer = {
Tabmix.setSanitizer.disableMenuItem();
pref.setAttribute("readonly", "true");
Tabmix.setItem(check, "onsyncfrompreference",
- "Tabmix.setSanitizer.checked = this.checked; " +
- "return gSanitizePromptDialog.onReadGeneric();");
+ "Tabmix.setSanitizer.checked = this.checked; " +
+ "return gSanitizePromptDialog.onReadGeneric();");
}
}
},
@@ -117,11 +117,11 @@ Tabmix.setSanitizer = {
var title = "Tab Mix Plus - " + document.title;
var msg = this._confirm;
var buttonPressed = promptService.confirmEx(null,
- title,
- msg,
- (promptService.BUTTON_TITLE_YES * promptService.BUTTON_POS_0) +
- (promptService.BUTTON_TITLE_NO * promptService.BUTTON_POS_1),
- null, null, null, null, {});
+ title,
+ msg,
+ (promptService.BUTTON_TITLE_YES * promptService.BUTTON_POS_0) +
+ (promptService.BUTTON_TITLE_NO * promptService.BUTTON_POS_1),
+ null, null, null, null, {});
if (buttonPressed == 1)
aCheckbox.checked = false;
}
diff --git a/chrome/content/preferences/overlay/preferences.xml b/chrome/content/preferences/overlay/preferences.xml
index 30414e9..4079d6b 100644
--- a/chrome/content/preferences/overlay/preferences.xml
+++ b/chrome/content/preferences/overlay/preferences.xml
@@ -26,8 +26,8 @@
).toCode();
} catch (ex) {
TabmixSvc.console.log(
- "TabMix :\n" +
- "can't change openLinkIn from preferences.xml binding\n" + ex);
+ "TabMix :\n" +
+ "can't change openLinkIn from preferences.xml binding\n" + ex);
}
]]>
</constructor>
diff --git a/chrome/content/preferences/preferences.js b/chrome/content/preferences/preferences.js
index ba5bd43..6581f27 100644
--- a/chrome/content/preferences/preferences.js
+++ b/chrome/content/preferences/preferences.js
@@ -612,6 +612,6 @@ XPCOMUtils.defineLazyGetter(this, "OS", () => {
});
XPCOMUtils.defineLazyModuleGetter(this, "AsyncUtils",
- "resource://tabmixplus/AsyncUtils.jsm");
+ "resource://tabmixplus/AsyncUtils.jsm");
Tabmix.lazy_import(window, "Shortcuts", "Shortcuts", "Shortcuts");
diff --git a/chrome/content/preferences/shortcuts.xml b/chrome/content/preferences/shortcuts.xml
index 6de63f2..b0dadf6 100644
--- a/chrome/content/preferences/shortcuts.xml
+++ b/chrome/content/preferences/shortcuts.xml
@@ -230,7 +230,7 @@
resetButton.hidden = false;
let defaultKey = getFormattedKey(Shortcuts.keyParse(defaultVal));
resetButton.setAttribute("tooltiptext",
- resetButton.getAttribute("tooltiptext") + "\nDefault is: " + defaultKey);
+ resetButton.getAttribute("tooltiptext") + "\nDefault is: " + defaultKey);
}
this.__defineGetter__("defaultPref", () => defaultVal);
return defaultVal;
diff --git a/chrome/content/scripts/content.js b/chrome/content/scripts/content.js
index 5be79a5..7ca6d82 100644
--- a/chrome/content/scripts/content.js
+++ b/chrome/content/scripts/content.js
@@ -249,7 +249,7 @@ TabmixClickEventHandler = {
let linkNode = href ? node : LinkNodeUtils.getNodeWithOnClick(event.target);
if (linkNode) {
linkNode = LinkNodeUtils.wrap(linkNode, TabmixUtils.focusedWindow(content),
- href && event.button === 0);
+ href && event.button === 0);
}
let result = sendSyncMessage("TabmixContent:Click",
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index e5705b0..883da8d 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -300,13 +300,13 @@ TabmixSessionManager = {
_init: function SM__init() {
if (Tabmix.isVersion(320)) {
XPCOMUtils.defineLazyModuleGetter(this, "TabState",
- "resource:///modules/sessionstore/TabState.jsm");
+ "resource:///modules/sessionstore/TabState.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "TabStateCache",
- "resource:///modules/sessionstore/TabStateCache.jsm");
+ "resource:///modules/sessionstore/TabStateCache.jsm");
}
XPCOMUtils.defineLazyModuleGetter(this, "TabmixGroupsMigrator",
- "resource://tabmixplus/TabGroupsMigrator.jsm");
+ "resource://tabmixplus/TabGroupsMigrator.jsm");
// just in case tablib isn't init yet
// when Webmail Notifier extension installed and user have master password
@@ -566,7 +566,7 @@ TabmixSessionManager = {
},
windowIsClosing: function SM_WindowIsClosing(aCanClose, aLastWindow,
- aSaveSession, aRemoveClosedTabs, aKeepClosedWindows) {
+ aSaveSession, aRemoveClosedTabs, aKeepClosedWindows) {
if (this.isPrivateWindow) {
this.removeSession(this.gThisWin, this.gSessionPath[0]);
}
@@ -590,12 +590,12 @@ TabmixSessionManager = {
}
this.shutDown(aCanClose, aLastWindow, aSaveSession, aRemoveClosedTabs,
- aKeepClosedWindows, _flush);
+ aKeepClosedWindows, _flush);
},
sessionShutDown: false,
shutDown: function(aCanClose, aLastWindow, aSaveSession, aRemoveClosedTabs,
- aKeepClosedWindows, _flush) {
+ aKeepClosedWindows, _flush) {
if (this.sessionShutDown)
return;
if (aLastWindow && aCanClose) {
@@ -3170,7 +3170,7 @@ TabmixSessionManager = {
}
var newWindow =
Services.ww.openWindow(null, Services.prefs.getCharPref("browser.chromeURL"),
- "_blank", features, argString);
+ "_blank", features, argString);
let ID;
do {
diff --git a/chrome/content/tab/scrollbox.xml b/chrome/content/tab/scrollbox.xml
index 20defde..5c69718 100644
--- a/chrome/content/tab/scrollbox.xml
+++ b/chrome/content/tab/scrollbox.xml
@@ -116,7 +116,7 @@
<method name="_getScrollableElements">
<body><![CDATA[
return Array.prototype.filter.call(document.getBindingParent(this).childNodes,
- this._canScrollToElement, this);
+ this._canScrollToElement, this);
]]></body>
</method>
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index 8961820..a82539b 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -128,7 +128,7 @@ var TabmixTabbar = {
// fix bug in positioning the popup off screen or on the button when window
// is not maximize or when tab bar is in the bottom
Tabmix.setItem("alltabs-popup", "position",
- (window.windowState != window.STATE_MAXIMIZED || this.position == 1) ? "start_before" : "after_end");
+ (window.windowState != window.STATE_MAXIMIZED || this.position == 1) ? "start_before" : "after_end");
// for light weight themes
Tabmix.setItem("main-window", "tabmix_lwt", isMultiRow || this.position == 1 || null);
@@ -385,7 +385,7 @@ var TabmixTabbar = {
}
/// maybe we cad add this to the popupshowing / or as css rule ?
Tabmix.setItem("alltabs-popup", "position",
- (window.windowState != window.STATE_MAXIMIZED || this.position == 1) ? "start_before" : "after_end");
+ (window.windowState != window.STATE_MAXIMIZED || this.position == 1) ? "start_before" : "after_end");
},
// Update positional attributes when we are in multi-row mode
@@ -988,7 +988,7 @@ Tabmix.tabsUtils = {
showNewTabButtonOnSide: function(aCondition, aValue) {
if (this._show_newtabbutton) {
Tabmix.setItem("TabsToolbar", "tabmix-show-newtabbutton",
- aCondition ? aValue : this._show_newtabbutton);
+ aCondition ? aValue : this._show_newtabbutton);
}
},
@@ -1652,7 +1652,7 @@ gTMPprefObserver = {
dynamicRules: {},
insertRule: function(cssText, name) {
let index = this.tabStyleSheet.insertRule(cssText,
- this.tabStyleSheet.cssRules.length);
+ this.tabStyleSheet.cssRules.length);
if (name)
this.dynamicRules[name] = this.tabStyleSheet.cssRules[index];
return index;
@@ -2365,13 +2365,13 @@ gTMPprefObserver = {
// 2008-09-23
if (Services.prefs.prefHasUserValue("browser.ctrlTab.mostRecentlyUsed")) {
Services.prefs.setBoolPref("browser.ctrlTab.previews",
- Services.prefs.getBoolPref("browser.ctrlTab.mostRecentlyUsed"));
+ Services.prefs.getBoolPref("browser.ctrlTab.mostRecentlyUsed"));
Services.prefs.clearUserPref("browser.ctrlTab.mostRecentlyUsed");
}
// 2008-09-28
if (Tabmix.prefs.prefHasUserValue("lasttab.handleCtrlTab")) {
Services.prefs.setBoolPref("browser.ctrlTab.previews",
- Tabmix.prefs.getBoolPref("lasttab.handleCtrlTab"));
+ Tabmix.prefs.getBoolPref("lasttab.handleCtrlTab"));
Tabmix.prefs.clearUserPref("lasttab.handleCtrlTab");
}
// 2008-11-29
@@ -2488,10 +2488,10 @@ gTMPprefObserver = {
}
_setNewTabUrl("extensions.tabmix.newTabUrl", TabmixSvc.newtabUrl, "loadOnNewTab.type");
_setNewTabUrl("extensions.tabmix.newTabUrl_afterLastTab",
- "extensions.tabmix.replaceLastTabWith.newtab.url", "replaceLastTabWith.type");
+ "extensions.tabmix.replaceLastTabWith.newtab.url", "replaceLastTabWith.type");
_setNewTabUrl("extensions.tabmix.newtab.url", TabmixSvc.newtabUrl);
_setNewTabUrl("extensions.tabmix.replaceLastTabWith.newTabUrl",
- "extensions.tabmix.replaceLastTabWith.newtab.url");
+ "extensions.tabmix.replaceLastTabWith.newtab.url");
// 2012-04-12
var pref = "browser.tabs.loadFolderAndReplace";
if (Services.prefs.prefHasUserValue(pref)) {
@@ -2709,8 +2709,8 @@ TabmixProgressListener = {
},
onProgressChange: function(aBrowser, aWebProgress, aRequest,
- aCurSelfProgress, aMaxSelfProgress,
- aCurTotalProgress, aMaxTotalProgress) {
+ aCurSelfProgress, aMaxSelfProgress,
+ aCurTotalProgress, aMaxTotalProgress) {
if (!this.showProgressOnTab || TabmixTabbar.hideMode == 2 || !aMaxTotalProgress)
return;
var percentage = Math.ceil((aCurTotalProgress * 100) / aMaxTotalProgress);
diff --git a/chrome/content/tab/tabbrowser_4.xml b/chrome/content/tab/tabbrowser_4.xml
index f0aae92..2594fe0 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -348,7 +348,7 @@
<body><![CDATA[
var isSelected = this == this.parentNode.selectedItem;
Tabmix.setItem(this, "clickOnCurrent",
- isSelected && aEvent.detail == 1 || null);
+ isSelected && aEvent.detail == 1 || null);
if (isSelected)
return;
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 1be5065..c243ac8 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -61,7 +61,7 @@ Tabmix.sessionInitialized = function() {
};
this.setItem("Browser:RestoreLastSession", "disabled",
- !SM.canRestoreLastSession || SM.isPrivateWindow);
+ !SM.canRestoreLastSession || SM.isPrivateWindow);
if (TabmixSvc.isPaleMoon) {
this.changeCode(window, "window.BrowserOnAboutPageLoad")._replace(
@@ -236,7 +236,7 @@ Tabmix.afterDelayedStartup = function() {
"Once you disable 'Debug Mode' restart your browser.";
const errorimage = "chrome://tabmixplus/skin/tmpsmall.png";
gnb.appendNotification(msg, "tabmix-debugmode-enabled",
- errorimage, gnb.PRIORITY_CRITICAL_HIGH, buttons);
+ errorimage, gnb.PRIORITY_CRITICAL_HIGH, buttons);
}
};
diff --git a/chrome/content/utils.js b/chrome/content/utils.js
index ce2d13c..456e08a 100644
--- a/chrome/content/utils.js
+++ b/chrome/content/utils.js
@@ -164,7 +164,7 @@ var Tabmix = {
// we add dependent to features to make this dialog float over the window on start
var dialog = Services.ww.openWindow(aWindow,
- "chrome://tabmixplus/content/dialogs/promptservice.xul", "", "centerscreen" +
+ "chrome://tabmixplus/content/dialogs/promptservice.xul", "", "centerscreen" +
(modal ? ",modal" : ",dependent"), dpb);
if (!modal)
dialog._callBackFunction = aCallBack;
@@ -246,7 +246,7 @@ var Tabmix = {
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
- "resource:///modules/RecentWindow.jsm");
+ "resource:///modules/RecentWindow.jsm");
window.addEventListener("unload", function tabmix_destroy() {
window.removeEventListener("unload", tabmix_destroy, false);
diff --git a/modules/AsyncUtils.jsm b/modules/AsyncUtils.jsm
index 9b50a44..0708f18 100644
--- a/modules/AsyncUtils.jsm
+++ b/modules/AsyncUtils.jsm
@@ -7,7 +7,7 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
- "resource://gre/modules/Promise.jsm");
+ "resource://gre/modules/Promise.jsm");
this.AsyncUtils = {
/* PromiseUtils.defer exist since Firefox 39 */
diff --git a/modules/AutoReload.jsm b/modules/AutoReload.jsm
index 5e150ab..e59cb30 100644
--- a/modules/AutoReload.jsm
+++ b/modules/AutoReload.jsm
@@ -31,7 +31,7 @@ this.AutoReload = {
let parent = aPopup.parentNode;
win.Tabmix.setItem(aPopup, "onpopuphidden", "this._tab = null;");
win.Tabmix.setItem(aPopup, "oncommand",
- "Tabmix.autoReload.setTime(this._tab, event.originalTarget.value);event.stopPropagation();");
+ "Tabmix.autoReload.setTime(this._tab, event.originalTarget.value);event.stopPropagation();");
for (let i = 0; i < popup.childNodes.length; i++)
aPopup.appendChild(popup.childNodes[i].cloneNode(true));
if (parent.id != "reload-button") {
@@ -236,7 +236,7 @@ this.AutoReload = {
if (TabmixSvc.version(330)) {
aBrowser.messageManager
.sendAsyncMessage("Tabmix:setScrollPosition",
- aBrowser.__tabmixScrollPosition);
+ aBrowser.__tabmixScrollPosition);
} else {
let {x, y} = aBrowser.__tabmixScrollPosition;
aBrowser.contentWindow.scrollTo(x, y);
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index dce4c81..a61e89c 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -169,7 +169,7 @@ ContentClickInternal = {
// for non-link element with onclick that change location.href
getHrefFromNodeOnClick: function(event, browser, wrappedOnClickNode) {
if (!wrappedOnClickNode || !this.getHrefFromOnClick(event, null, wrappedOnClickNode,
- wrappedOnClickNode.getAttribute("onclick")))
+ wrappedOnClickNode.getAttribute("onclick")))
return false;
let href = event.__hrefFromOnClick;
@@ -1023,7 +1023,7 @@ ContentClickInternal = {
.sendAsyncMessage("Tabmix:isFrameInContent", this.frameData);
} else {
let result = LinkNodeUtils.isFrameInContent(browser.contentWindow,
- this.frameData.href, this.frameData.name);
+ this.frameData.href, this.frameData.name);
this.result(browser, {result: result});
}
} else {
diff --git a/modules/ContextMenu.jsm b/modules/ContextMenu.jsm
index 7bc136d..2e53961 100644
--- a/modules/ContextMenu.jsm
+++ b/modules/ContextMenu.jsm
@@ -8,7 +8,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "TabmixUtils",
- "resource://tabmixplus/Utils.jsm");
+ "resource://tabmixplus/Utils.jsm");
this.ContextMenu = {
getSelectedLinks: function(content, check) {
@@ -38,7 +38,7 @@ this.ContextMenu = {
try {
secMan.checkLoadURIStrWithPrincipal(
- doc.nodePrincipal, url, secMan.STANDARD);
+ doc.nodePrincipal, url, secMan.STANDARD);
} catch (e) {
return false;
}
@@ -47,7 +47,7 @@ this.ContextMenu = {
let range = selectionObject.getRangeAt(0).cloneContents();
let treeWalker = doc.createTreeWalker(range,
- Ci.nsIDOMNodeFilter.SHOW_ELEMENT, filter, true);
+ Ci.nsIDOMNodeFilter.SHOW_ELEMENT, filter, true);
let nextEpisode = treeWalker.nextNode();
let urls = [];
while (nextEpisode !== null) {
diff --git a/modules/MergeWindows.jsm b/modules/MergeWindows.jsm
index 999364f..f36fae6 100644
--- a/modules/MergeWindows.jsm
+++ b/modules/MergeWindows.jsm
@@ -104,7 +104,7 @@ this.MergeWindows = {
var features = "chrome,all,dialog=no";
features += aPrivate ? ",private" : ",non-private";
var newWindow = aWindows[0].openDialog("chrome://browser/content/browser.xul",
- "_blank", features, null);
+ "_blank", features, null);
let mergePopUps = function _mergePopUps() {
newWindow.removeEventListener("SSWindowStateReady", _mergePopUps, false);
this.concatTabsAndMerge(newWindow, aWindows);
@@ -298,7 +298,7 @@ this.MergeWindows = {
if (!notificationBox.getNotificationWithValue(name)) {
const priority = notificationBox.PRIORITY_INFO_MEDIUM;
let notificationBar = notificationBox.appendNotification(errorMessage,
- name, errorimage, priority, null);
+ name, errorimage, priority, null);
aWindow.setTimeout(function() {
notificationBox.removeNotification(notificationBar);
}, 10000);
@@ -317,10 +317,10 @@ this.MergeWindows = {
var promptAgain = {value: true};
canClose = Services.prompt.confirmCheck(aWindow,
- TabmixSvc.getString('tmp.merge.warning.title'),
- TabmixSvc.getString('tmp.merge.warning.message'),
- TabmixSvc.getString('tmp.merge.warning.checkboxLabel'),
- promptAgain);
+ TabmixSvc.getString('tmp.merge.warning.title'),
+ TabmixSvc.getString('tmp.merge.warning.message'),
+ TabmixSvc.getString('tmp.merge.warning.checkboxLabel'),
+ promptAgain);
if (canClose && !promptAgain.value)
this.prefs.setBoolPref("warnOnClose", false);
diff --git a/modules/NewTabURL.jsm b/modules/NewTabURL.jsm
index 042a6f6..1fccc3f 100644
--- a/modules/NewTabURL.jsm
+++ b/modules/NewTabURL.jsm
@@ -8,14 +8,14 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
- "@mozilla.org/browser/aboutnewtab-service;1",
- "nsIAboutNewTabService");
+ "@mozilla.org/browser/aboutnewtab-service;1",
+ "nsIAboutNewTabService");
XPCOMUtils.defineLazyModuleGetter(this, "NewTabURL",
- "resource:///modules/NewTabURL.jsm");
+ "resource:///modules/NewTabURL.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "TabmixSvc",
- "resource://tabmixplus/Services.jsm");
+ "resource://tabmixplus/Services.jsm");
const FIREFOX_PREF = "browser.#.url".replace("#", "newtab");
const ABOUT_NEW_TAB = "about:#".replace("#", "newtab");
diff --git a/modules/RenameTab.jsm b/modules/RenameTab.jsm
index 053fe2a..5880a3d 100644
--- a/modules/RenameTab.jsm
+++ b/modules/RenameTab.jsm
@@ -32,7 +32,7 @@ this.RenameTab = {
browser.contentTitle;
this.data.url = browser.currentURI.spec;
this.data.docTitle = TabmixPlacesUtils.getTitleFromBookmark(this.data.url,
- docTitle, null, aTab);
+ docTitle, null, aTab);
if (!this.data.docTitle)
this.data.docTitle = this.window.isBlankPageURL(this.data.url) ?
gBrowser.mStringBundle.getString("tabs.emptyTabTitle") : this.data.url;
@@ -95,10 +95,10 @@ this.RenameTab = {
let width = popup.boxObject.width || 330;
let height = popup.boxObject.height || 215;
popup.openPopupAtScreen(screen.availLeft + (screen.availWidth - width) / 2,
- screen.availTop + (screen.availHeight - height) / 2, false);
+ screen.availTop + (screen.availHeight - height) / 2, false);
if (popup.boxObject.width != width) {
popup.moveTo(screen.availLeft + (screen.availWidth - popup.boxObject.width) / 2,
- screen.availTop + (screen.availHeight - popup.boxObject.height) / 2);
+ screen.availTop + (screen.availHeight - popup.boxObject.height) / 2);
}
}
diff --git a/modules/Shortcuts.jsm b/modules/Shortcuts.jsm
index 9fc2cb2..607a5c2 100644
--- a/modules/Shortcuts.jsm
+++ b/modules/Shortcuts.jsm
@@ -9,7 +9,7 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://tabmixplus/Services.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
- "resource://gre/modules/PrivateBrowsingUtils.jsm");
+ "resource://gre/modules/PrivateBrowsingUtils.jsm");
var KeyConfig;
this.Shortcuts = {
diff --git a/modules/Slideshow.jsm b/modules/Slideshow.jsm
index d8b9304..21ccc44 100644
--- a/modules/Slideshow.jsm
+++ b/modules/Slideshow.jsm
@@ -46,7 +46,7 @@ flst.prototype = {
let timerInterval = TabmixSvc.prefBranch.getIntPref("slideDelay") * 1000;
this.slideShowTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
this.slideShowTimer.initWithCallback(this, timerInterval,
- Ci.nsITimer.TYPE_REPEATING_SLACK);
+ Ci.nsITimer.TYPE_REPEATING_SLACK);
this.showAlert(this.slideshowOn, "slideShow");
}
},
diff --git a/modules/TabGroupsMigrator.jsm b/modules/TabGroupsMigrator.jsm
index 233143a..61463d8 100644
--- a/modules/TabGroupsMigrator.jsm
+++ b/modules/TabGroupsMigrator.jsm
@@ -7,10 +7,10 @@ const {interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Services",
- "resource://gre/modules/Services.jsm");
+ "resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
- "resource://gre/modules/Promise.jsm");
+ "resource://gre/modules/Promise.jsm");
XPCOMUtils.defineLazyGetter(this, "TabGroupsMigrator", function() {
if (!TabmixSvc.version(450)) {
@@ -29,16 +29,16 @@ XPCOMUtils.defineLazyGetter(this, "TabGroupsMigrator", function() {
});
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
- "resource://gre/modules/PlacesUtils.jsm");
+ "resource://gre/modules/PlacesUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
- "resource://gre/modules/AsyncShutdown.jsm");
+ "resource://gre/modules/AsyncShutdown.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "TabmixSvc",
- "resource://tabmixplus/Services.jsm");
+ "resource://tabmixplus/Services.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "TabmixPlacesUtils",
- "resource://tabmixplus/Places.jsm");
+ "resource://tabmixplus/Places.jsm");
XPCOMUtils.defineLazyGetter(this, "gBrowserBundle", function() {
return Services.strings.createBundle('chrome://browser/locale/browser.properties');
diff --git a/modules/log.jsm b/modules/log.jsm
index 64ac27c..bccf526 100644
--- a/modules/log.jsm
+++ b/modules/log.jsm
@@ -348,7 +348,7 @@ options = {
let {filename, lineNumber, columnNumber} = caller;
let consoleMsg = Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError);
consoleMsg.init("Tabmix" + msg, filename, null, lineNumber, columnNumber,
- Ci.nsIScriptError[flag], "component javascript");
+ Ci.nsIScriptError[flag], "component javascript");
Services.console.logMessage(consoleMsg);
},
--
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