[Pkg-mozext-commits] [tabmixplus] 27/56: Update Eslint Tabmix and Firefox globals, enable eslint-plugin-mozilla import-globals rules
David Prévot
taffit at moszumanska.debian.org
Mon Jun 6 00:02:35 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 8e9bede61496da5289b19107f595c49ad1e0b762
Author: onemen <tabmix.onemen at gmail.com>
Date: Sat May 14 20:49:53 2016 +0300
Update Eslint Tabmix and Firefox globals, enable eslint-plugin-mozilla import-globals rules
---
.eslintrc.js | 199 +++------------------
.eslintrc_mozilla.js | 10 --
chrome/content/click/click.js | 2 +-
chrome/content/content.js | 2 +
chrome/content/links/newTab.js | 1 +
chrome/content/links/removeBlankTab.js | 1 +
chrome/content/minit/minit.js | 5 +-
chrome/content/minit/tabView.js | 1 -
chrome/content/places/places.js | 4 +
.../preferences/overlay/overlaySanitizeUI.js | 1 +
chrome/content/preferences/preferences.js | 5 +-
chrome/content/preferences/session.js | 1 +
chrome/content/session/session.js | 1 -
chrome/content/tabmix.js | 11 ++
chrome/content/utils.js | 2 +-
defaults/preferences/tabmix.js | 1 +
modules/RenameTab.jsm | 5 +-
modules/Services.jsm | 5 +-
modules/SingleWindowModeUtils.jsm | 1 +
modules/TabGroupsMigrator.jsm | 1 -
modules/extensions/TabGroupsManager.jsm | 4 +-
21 files changed, 69 insertions(+), 194 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index 9d8f8d6..f0fe690 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,6 +2,7 @@
/* global module */
module.exports = {
"root": true,
+ "plugins": ["mozilla"],
"env": {
"browser": true,
"es6": true,
@@ -17,6 +18,10 @@ module.exports = {
},
"rules": {
+ "mozilla/balanced-listeners": 2,
+ "mozilla/import-globals": 2,
+ "mozilla/import-browserjs-globals": 2,
+
"no-alert": 2,
"no-array-constructor": 2,
"no-bitwise": 0,
@@ -242,203 +247,53 @@ module.exports = {
},
"globals": {
- // tabmix globals
- // when extends will work in Brackets move each global to
- // specific file in its folder
- "$": true,
- "self": true,
- "AsyncUtils": false,
- "Assert": false,
- "AutoReload": false,
- "exports": false,
- "KeyEvent": false,
- "Decode": false,
- "filenamesRegex": false,
- "MergeWindows": false,
- "getFormattedKey": false,
- "getKeysForShortcut": false,
- "gTMPprefObserver": true,
- "gAppearancePane": false,
- "gPrefWindow": false,
- "PromptSvc": false,
- "gMenuPane": false,
- "isMac": false,
- "LinkNodeUtils": false,
- "Prefs": false,
- "reportError": false,
- "RDFSvc": false,
- "Shortcuts": false,
- "SessionBackups": false,
- "SSS": false,
- "syncPrefsList": false,
- "tablib": false,
- "Tabmix": true,
- "TabmixAboutNewTab": false,
- "TabmixAllTabs": false,
- "TabmixContext": false,
- "TabmixContentClick": false,
- "TabmixConvertSession": false,
- "TabmixProgressListener": true,
- "TabmixPlacesUtils": false,
- "TabmixSessionData": true,
- "TabmixSessionManager": true,
- "TabmixSvc": false,
- "TabmixTabbar": false,
- "TabmixTabClickOptions": false,
- "TabmixUtils": false,
- "TMP_BrowserOpenTab": false,
- "TMP_ClosedTabs": false,
- "TMP_eventListener": true,
- "TMP_extensionsCompatibility": false,
- "TMP_LastTab": false,
- "TMP_Places": false,
- "TMP_SessionStore": false,
- "TMP_tabDNDObserver": false,
- "TMP_TabView": false,
-
// firefox globals
- "aboutNewTabService": false,
- "addMessageListener": false,
- "AddonManager": false,
- "BROWSER_NEW_TAB_URL": false,
- "BrowserOnClick": false,
- "BrowserCloseTabOrWindow": false,
- "browserDragAndDrop": false,
- "BrowserOpenTab": false,
- "BrowserTryToCloseWindow": false,
- "BrowserUtils": false,
- "Cc": true,
- "centerWindowOnScreen": false,
- "ChromeWindow": false,
- "Ci": true,
- "closeMenus": false,
"Components": false,
- "content": false,
- "ContentClick": false,
- "ContextMenu": false,
- "Cr": true,
- "ctrlTab": false,
- "Cu": true,
- "CustomizableUI": false,
- "customizeToolbarDone": false,
- "closeWindow": false,
- "dialog": false,
- "DirectoryLinksProvider": false,
- "docShell": false,
- "DocShellCapabilities": false,
- "dump": false,
- "focusAndSelectUrlBar": false,
- "FullScreen": false,
- "gAllPages": false,
- "gBrowser": false,
- "gBrowserInit": false,
- "gContextMenu": false,
- "getBoolPref": false,
- "getBrowserURL": false,
- "gGrid": false,
- "gHomeButton": false,
- "gInPrintPreviewMode": false,
- "gMultiProcessBrowser": false,
- "gNavigatorBundle": false,
- "gNavToolbox": false,
- "goDoCommand": false,
- "gRemoteTabsUI": false,
- "gSanitizePromptDialog": false,
- "gURLBar": false,
- "handleDroppedLink": false,
- "HistoryMenu": false,
- "isBlankPageURL": false,
- "isTabEmpty": false,
- "loadURI": false,
- "makeURI": false,
- "moveToAlertPosition": false,
- "NetUtil": false,
- "nsBrowserAccess": false,
- "nsContextMenu": false,
- "NewTabURL": false,
- "newWindowButtonObserver": false,
- "openDialog": false,
- "openLinkIn": false,
- "openUILink": false,
- "openUILinkIn": false,
- "openURI": false,
- "OS": false,
- "PanelUI": false,
- "PageThumbs": false,
- "PlacesCommandHook": false,
- "PlacesOrganizer": false,
- "PlacesUIUtils": false,
- "PlacesUtils": false,
- "PlacesViewBase": false,
- "PluralForm": false,
- "pref": false,
- "PrivateBrowsingUtils": false,
- "RestoreLastSessionObserver": false,
- "Sanitizer": false,
- "Scratchpad": false,
- "sendAsyncMessage": false,
- "sendSyncMessage": false,
- "sendRpcMessage": false,
- "Services": false,
- "SidebarUtils": false,
- "SessionStore": false,
- "TabContextMenu": false,
- "TabGroupsMigrator": false,
- "TAB_DROP_TYPE": false,
- "TabsInTitlebar": false,
+
+ // globals that removed from Firefox
"TabsOnTop": false,
- "TabState": false,
- "TabStateCache": false,
"TabView": false,
- "Task": false,
- "URLBarSetURI": false,
- "urlSecurityCheck": false,
- "undoCloseWindow": false,
- "whereToOpenLink": false,
- "XPCOMUtils": false,
- "XULCommandEvent": false,
- "XULElement": false,
- "XULBrowserWindow": false,
+ "TabItems": false,
+
+ // Firefox defining these in placesOverlay.xul
+ "PlacesUtils": false,
+ "PlacesUIUtils": false,
// other
- "cookiepieContextMenu": false,
+ "bgSaverPref": false,
+ "CHROMATABS": false,
"classiccompactoptions": false,
+ "closeallOverlay": false,
"colorfulTabs": false,
+ "com": false,
+ "contentAreaDNDObserver": false,
+ "cookiepieContextMenu": false,
"esteban_torres": false,
+ "faviconize": false,
"Fd": false,
"FdTabLoader": false,
- "IeView": false,
- "ieview": false,
- "IeTab": false,
- "middleMousePaste": false,
- "privateTab": false,
- "SessionSaver": false,
- "SwitchThemesModule": false,
- "SubmitToTab": false,
-
- // extensions folder globals
- "bgSaverPref": false,
- "CHROMATABS": false,
- "contentAreaDNDObserver": false,
- "com": false,
- "closeallOverlay": false,
- "faviconize": false,
- "FireGestures": false,
"FdUtils": false,
+ "FireGestures": false,
"foxTab": false,
"gFxWeaveGlue": false,
+ "IeTab": false,
"IeTab2": false,
+ "IeView": false,
+ "ieview": false,
"Local_Install": false,
"mgBuiltInFunctions": false,
"MouseControl": false,
"objLinkify": false,
- "Omnibar": false,
"PersonaController": false,
+ "privateTab": false,
"rdrb": false,
"readPref": false,
"RSSTICKER": false,
"SecondSearchBrowser": false,
+ "SessionSaver": false,
"SpeedDial": false,
+ "SubmitToTab": false,
+ "SwitchThemesModule": false,
"tileTabs": false,
"TreeStyleTabBrowser": false,
"TreeStyleTabWindowHelper": false
diff --git a/.eslintrc_mozilla.js b/.eslintrc_mozilla.js
deleted file mode 100644
index 9227a52..0000000
--- a/.eslintrc_mozilla.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/* eslint strict: 0, object-curly-spacing: 0 */
-/* global module */
-module.exports = {
- "plugins": ["eslint-plugin-mozilla"],
-
- "rules": {
- "mozilla/balanced-listeners": 2,
- "linebreak-style": [2, "windows"]
- }
-};
diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index 22d2f57..c7a6c78 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -733,7 +733,7 @@ var TabmixContext = {
openMultipleLinks: function TMP_openMultipleLinks(check) {
let urls = Tabmix.isVersion(420) ? gContextMenu.tabmixLinks :
- Tabmix.ContextMenu.getSelectedLinks(content, check);
+ Tabmix.ContextMenu.getSelectedLinks(window.content, check);
if (!check && urls.length) {
Tabmix.loadTabs(urls, false);
diff --git a/chrome/content/content.js b/chrome/content/content.js
index 2e3f349..b7ba467 100644
--- a/chrome/content/content.js
+++ b/chrome/content/content.js
@@ -1,4 +1,6 @@
/* eslint mozilla/balanced-listeners:0 */
+/* globals content, docShell, addMessageListener, sendSyncMessage,
+ sendAsyncMessage, sendRpcMessage */
"use strict";
var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
diff --git a/chrome/content/links/newTab.js b/chrome/content/links/newTab.js
index f30d9d9..8768971 100644
--- a/chrome/content/links/newTab.js
+++ b/chrome/content/links/newTab.js
@@ -1,3 +1,4 @@
+/* globals gGrid, Cu*/
"use strict";
// This file is in use for all versions before Firefox 42.0
diff --git a/chrome/content/links/removeBlankTab.js b/chrome/content/links/removeBlankTab.js
index f70ec9a..de46e3c 100644
--- a/chrome/content/links/removeBlankTab.js
+++ b/chrome/content/links/removeBlankTab.js
@@ -1,3 +1,4 @@
+/* globals dialog, Ci */
"use strict";
const Cu = Components.utils;
diff --git a/chrome/content/minit/minit.js b/chrome/content/minit/minit.js
index 81ad329..382a5e7 100644
--- a/chrome/content/minit/minit.js
+++ b/chrome/content/minit/minit.js
@@ -1,3 +1,4 @@
+/* globals ChromeWindow, XULElement */
/* exported TMP_undocloseTabButtonObserver, TMP_TabView */
"use strict";
@@ -1232,9 +1233,9 @@ Tabmix.navToolbox = {
this.urlBarInitialized = obj[fn].toString().indexOf(TMP_fn) > -1;
// For the case Omnibar version 0.7.7.20110418+ change handleCommand before we do.
- if (_Omnibar && typeof (Omnibar.intercepted_handleCommand) == "function") {
+ if (_Omnibar && typeof (window.Omnibar.intercepted_handleCommand) == "function") {
window.Omnibar.intercepted_handleCommand = gURLBar[fn];
- Tabmix.changeCode(Omnibar, "Omnibar.intercepted_handleCommand")._replace(
+ Tabmix.changeCode(window.Omnibar, "Omnibar.intercepted_handleCommand")._replace(
'Omnibar.handleSearchQuery',
'false && Omnibar.handleSearchQuery', {silent: true}
).toCode();
diff --git a/chrome/content/minit/tabView.js b/chrome/content/minit/tabView.js
index f25746a..e9629a0 100644
--- a/chrome/content/minit/tabView.js
+++ b/chrome/content/minit/tabView.js
@@ -1,4 +1,3 @@
- /* globals TabItems */
"use strict";
TMP_TabView.subScriptLoaded = true;
diff --git a/chrome/content/places/places.js b/chrome/content/places/places.js
index ea4b526..9f5aa85 100644
--- a/chrome/content/places/places.js
+++ b/chrome/content/places/places.js
@@ -1,3 +1,7 @@
+/* globals XULCommandEvent */
+/* import-globals-from-firefox browser/content/browser/places/places.js */
+/* import-globals-from-firefox browser/content/browser/places/browserPlacesViews.js */
+/* import-globals-from-firefox browser/content/browser/bookmarks/sidebarUtils.js */
"use strict";
// code by onemen
diff --git a/chrome/content/preferences/overlay/overlaySanitizeUI.js b/chrome/content/preferences/overlay/overlaySanitizeUI.js
index 5e4fd16..e120cb3 100644
--- a/chrome/content/preferences/overlay/overlaySanitizeUI.js
+++ b/chrome/content/preferences/overlay/overlaySanitizeUI.js
@@ -1,3 +1,4 @@
+/* import-globals-from-firefox browser/content/browser/sanitizeDialog.js */
"use strict";
Tabmix.setSanitizer = {
diff --git a/chrome/content/preferences/preferences.js b/chrome/content/preferences/preferences.js
index cad4fcc..1f982f6 100644
--- a/chrome/content/preferences/preferences.js
+++ b/chrome/content/preferences/preferences.js
@@ -1,6 +1,9 @@
-/* globals _sminstalled, gPreferenceList */
/* exported defaultSetting, toggleSyncPreference, exportData, importData,
showPane, openHelp */
+/* import-globals-from ../utils.js */
+/* import-globals-from shortcuts.js */
+/* import-globals-from menu.js */
+/* import-globals-from appearance.js */
"use strict";
/***** Preference Dialog Functions *****/
diff --git a/chrome/content/preferences/session.js b/chrome/content/preferences/session.js
index f406b6f..015421d 100644
--- a/chrome/content/preferences/session.js
+++ b/chrome/content/preferences/session.js
@@ -1,3 +1,4 @@
+/* globals TabmixSessionManager */
/* exported gSessionPane */
"use strict";
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index a14b502..0a56f8b 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -109,7 +109,6 @@ Tabmix.Sanitizer = {
try {
aFile.remove(aFile.isDirectory());
} catch (ex) {
- dump(ex + "\n");
Tabmix.assert(ex);
} // couldn't remove the file - what now?
}
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index ef1447c..063d063 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -1,3 +1,14 @@
+/* import-globals-from utils.js */
+/* import-globals-from ./click/click.js */
+/* import-globals-from ./extensions/extensions.js */
+/* import-globals-from ./flst/lasttab.js */
+/* import-globals-from ./links/userInterface.js */
+/* import-globals-from ./minit/minit.js */
+/* import-globals-from ./minit/tablib.js */
+/* import-globals-from ./places/places.js */
+/* import-globals-from ./session/sessionStore.js */
+/* import-globals-from ./session/session.js */
+/* import-globals-from ./tab/tab.js */
"use strict";
/*
diff --git a/chrome/content/utils.js b/chrome/content/utils.js
index 51d318d..14e4d95 100644
--- a/chrome/content/utils.js
+++ b/chrome/content/utils.js
@@ -239,7 +239,6 @@ var Tabmix = {
_init: function() {
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
- this.lazy_import(window, "TabmixSvc", "Services", "TabmixSvc");
XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
"resource:///modules/RecentWindow.jsm");
@@ -268,3 +267,4 @@ var Tabmix = {
};
Tabmix._init();
+Tabmix.lazy_import(window, "TabmixSvc", "Services", "TabmixSvc");
diff --git a/defaults/preferences/tabmix.js b/defaults/preferences/tabmix.js
index 25aeee2..95f3967 100644
--- a/defaults/preferences/tabmix.js
+++ b/defaults/preferences/tabmix.js
@@ -1,3 +1,4 @@
+/* globals pref */
/* eslint strict: 0 */
pref("extensions.tabmix.disableIncompatible", true);
diff --git a/modules/RenameTab.jsm b/modules/RenameTab.jsm
index 41dd754..5bdffcd 100644
--- a/modules/RenameTab.jsm
+++ b/modules/RenameTab.jsm
@@ -4,8 +4,11 @@ this.EXPORTED_SYMBOLS = ["RenameTab"];
const Cu = Components.utils;
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://tabmixplus/Services.jsm");
-Cu.import("resource://tabmixplus/Places.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "TabmixPlacesUtils",
+ "resource://tabmixplus/Places.jsm");
this.RenameTab = {
window: null,
diff --git a/modules/Services.jsm b/modules/Services.jsm
index 55ce838..205df7f 100644
--- a/modules/Services.jsm
+++ b/modules/Services.jsm
@@ -1,3 +1,4 @@
+/* globals dump */
"use strict";
this.EXPORTED_SYMBOLS = ["TabmixSvc"];
@@ -7,6 +8,9 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TabmixPlacesUtils",
+ "resource://tabmixplus/Places.jsm");
+
var tabStateCache;
var _versions = {};
function isVersion(aVersionNo) {
@@ -182,7 +186,6 @@ this.TabmixSvc = {
Cu.import("resource://tabmixplus/DownloadLastDir.jsm");
- Cu.import("resource://tabmixplus/Places.jsm");
TabmixPlacesUtils.init(aWindow);
TabmixSvc.tabStylePrefs = {};
diff --git a/modules/SingleWindowModeUtils.jsm b/modules/SingleWindowModeUtils.jsm
index 7a5ae16..4be4126 100644
--- a/modules/SingleWindowModeUtils.jsm
+++ b/modules/SingleWindowModeUtils.jsm
@@ -1,3 +1,4 @@
+/* globals PanelUI */
"use strict";
this.EXPORTED_SYMBOLS = ["SingleWindowModeUtils"];
diff --git a/modules/TabGroupsMigrator.jsm b/modules/TabGroupsMigrator.jsm
index 970e1df..39318c2 100644
--- a/modules/TabGroupsMigrator.jsm
+++ b/modules/TabGroupsMigrator.jsm
@@ -1,4 +1,3 @@
-/* globals AsyncShutdown, gBrowserBundle */
"use strict";
this.EXPORTED_SYMBOLS = ["TabmixGroupsMigrator"];
diff --git a/modules/extensions/TabGroupsManager.jsm b/modules/extensions/TabGroupsManager.jsm
index c212b70..cb282e5 100644
--- a/modules/extensions/TabGroupsManager.jsm
+++ b/modules/extensions/TabGroupsManager.jsm
@@ -136,13 +136,13 @@ this.TMP_TabGroupsManager = {
if (!this.enableBackup && !windowNode)
return;
try {
- let value = jsonText || TabmixSvc.ss.getWindowValue(window, "TabGroupsManagerAllGroupsData");
+ let value = jsonText || window.TabmixSvc.ss.getWindowValue(window, "TabGroupsManagerAllGroupsData");
if (!windowNode)
windowNode = this.gThisWin;
this.setLiteral(windowNode, "tgm_jsonText", encodeURI(value));
this.saveStateDelayed();
} catch (ex) {
- Tabmix.assert(ex);
+ window.Tabmix.assert(ex);
}
}
--
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