[Pkg-mozext-commits] [tabmixplus] 16/147: Apply new Eslint rule 'no-single-arg-cu-import' from tabmix plugin (based on mozilla plugin
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 a2397efaa755712949626039dcd252926778e14e
Author: onemen <tabmix.onemen at gmail.com>
Date: Sat Oct 29 11:29:59 2016 +0300
Apply new Eslint rule 'no-single-arg-cu-import' from tabmix plugin (based on mozilla plugin
---
.eslintrc.js | 1 +
chrome/content/overlay/removeBlankTab.js | 2 +-
chrome/content/scripts/content.js | 4 ++--
modules/AboutNewTab.jsm | 2 +-
modules/AsyncUtils.jsm | 2 +-
modules/AutoReload.jsm | 4 ++--
modules/ContentClick.jsm | 12 ++++++++++--
modules/ContextMenu.jsm | 4 ++--
modules/DocShellCapabilities.jsm | 2 +-
modules/DownloadLastDir.jsm | 2 +-
modules/DynamicRules.jsm | 2 +-
modules/MergeWindows.jsm | 6 +++---
modules/NewTabURL.jsm | 4 ++--
modules/Places.jsm | 2 +-
modules/RenameTab.jsm | 4 ++--
modules/Services.jsm | 6 +++---
modules/Shortcuts.jsm | 6 +++---
modules/SingleWindowModeUtils.jsm | 6 +++---
modules/Slideshow.jsm | 4 ++--
modules/TabGroupsMigrator.jsm | 2 +-
modules/Utils.jsm | 2 +-
modules/extensions/AddonManager.jsm | 4 ++--
modules/extensions/CompatibilityCheck.jsm | 6 +++---
modules/log.jsm | 4 ++--
24 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index 839e617..77dfa7d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -16,6 +16,7 @@ module.exports = {
"rules": {
"tabmix/balanced-listeners": 2,
"tabmix/import-globals": 2,
+ "tabmix/no-single-arg-cu-import": 2,
"no-alert": 2,
"no-array-constructor": 2,
"no-bitwise": 0,
diff --git a/chrome/content/overlay/removeBlankTab.js b/chrome/content/overlay/removeBlankTab.js
index de46e3c..fbb824c 100644
--- a/chrome/content/overlay/removeBlankTab.js
+++ b/chrome/content/overlay/removeBlankTab.js
@@ -3,7 +3,7 @@
const Cu = Components.utils;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
diff --git a/chrome/content/scripts/content.js b/chrome/content/scripts/content.js
index 7ca6d82..6841546 100644
--- a/chrome/content/scripts/content.js
+++ b/chrome/content/scripts/content.js
@@ -5,8 +5,8 @@
var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/Services.jsm", this);
// DocShellCapabilities exist since Firefox 27
XPCOMUtils.defineLazyModuleGetter(this, "DocShellCapabilities",
diff --git a/modules/AboutNewTab.jsm b/modules/AboutNewTab.jsm
index b82edfe..1688f33 100644
--- a/modules/AboutNewTab.jsm
+++ b/modules/AboutNewTab.jsm
@@ -4,7 +4,7 @@ this.EXPORTED_SYMBOLS = ["TabmixAboutNewTab"];
const Cu = Components.utils;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "DirectoryLinksProvider",
"resource:///modules/DirectoryLinksProvider.jsm");
diff --git a/modules/AsyncUtils.jsm b/modules/AsyncUtils.jsm
index 0708f18..5e09d87 100644
--- a/modules/AsyncUtils.jsm
+++ b/modules/AsyncUtils.jsm
@@ -4,7 +4,7 @@ this.EXPORTED_SYMBOLS = ["AsyncUtils"];
const Cu = Components.utils;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
"resource://gre/modules/Promise.jsm");
diff --git a/modules/AutoReload.jsm b/modules/AutoReload.jsm
index e59cb30..0759ff7 100644
--- a/modules/AutoReload.jsm
+++ b/modules/AutoReload.jsm
@@ -4,8 +4,8 @@ this.EXPORTED_SYMBOLS = ["AutoReload"];
const {interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://tabmixplus/Services.jsm");
+Cu.import("resource://gre/modules/Services.jsm", this);
+Cu.import("resource://tabmixplus/Services.jsm", this);
var _setItem = function() {};
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index a61e89c..106b5df 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -4,7 +4,10 @@ this.EXPORTED_SYMBOLS = ["TabmixContentClick"];
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+
+XPCOMUtils.defineLazyModuleGetter(this, "ContentClick",
+ "resource:///modules/ContentClick.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
@@ -69,8 +72,13 @@ ContentClickInternal = {
// ContentClick.jsm is not included in some Firefox forks:
// Cyberfox before version 42
try {
- Cu.import("resource:///modules/ContentClick.jsm");
+ if (typeof ContentClick.contentAreaClick !== "function") {
+ TabmixSvc.console.log("ContentClick.contentAreaClick is not a function");
+ this.functions = [];
+ return;
+ }
} catch (ex) {
+ TabmixSvc.console.log("ContentClick.jsm is not included");
this.functions = [];
return;
}
diff --git a/modules/ContextMenu.jsm b/modules/ContextMenu.jsm
index 2e53961..75e1084 100644
--- a/modules/ContextMenu.jsm
+++ b/modules/ContextMenu.jsm
@@ -4,8 +4,8 @@ this.EXPORTED_SYMBOLS = ["ContextMenu"];
const {interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/Services.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "TabmixUtils",
"resource://tabmixplus/Utils.jsm");
diff --git a/modules/DocShellCapabilities.jsm b/modules/DocShellCapabilities.jsm
index 99b9fd3..b4ced1b 100644
--- a/modules/DocShellCapabilities.jsm
+++ b/modules/DocShellCapabilities.jsm
@@ -4,7 +4,7 @@ this.EXPORTED_SYMBOLS = ["DocShellCapabilities"];
const Cu = Components.utils;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "TabState",
"resource:///modules/sessionstore/TabState.jsm");
diff --git a/modules/DownloadLastDir.jsm b/modules/DownloadLastDir.jsm
index fa96a8d..3655565 100644
--- a/modules/DownloadLastDir.jsm
+++ b/modules/DownloadLastDir.jsm
@@ -6,7 +6,7 @@ this.EXPORTED_SYMBOLS = ["TabmixDownloadLastDir"];
const {interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
diff --git a/modules/DynamicRules.jsm b/modules/DynamicRules.jsm
index 9b63a32..ebc262a 100644
--- a/modules/DynamicRules.jsm
+++ b/modules/DynamicRules.jsm
@@ -4,7 +4,7 @@ this.EXPORTED_SYMBOLS = ["DynamicRules"];
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
diff --git a/modules/MergeWindows.jsm b/modules/MergeWindows.jsm
index f36fae6..4bd9a72 100644
--- a/modules/MergeWindows.jsm
+++ b/modules/MergeWindows.jsm
@@ -4,9 +4,9 @@ this.EXPORTED_SYMBOLS = ["MergeWindows"];
const Cu = Components.utils;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://tabmixplus/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/Services.jsm", this);
+Cu.import("resource://tabmixplus/Services.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
diff --git a/modules/NewTabURL.jsm b/modules/NewTabURL.jsm
index 1fccc3f..89395c9 100644
--- a/modules/NewTabURL.jsm
+++ b/modules/NewTabURL.jsm
@@ -4,8 +4,8 @@ this.EXPORTED_SYMBOLS = ["Tabmix_NewTabURL"];
const {interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/Services.jsm", this);
XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
"@mozilla.org/browser/aboutnewtab-service;1",
diff --git a/modules/Places.jsm b/modules/Places.jsm
index 97e494c..258df96 100644
--- a/modules/Places.jsm
+++ b/modules/Places.jsm
@@ -4,7 +4,7 @@ this.EXPORTED_SYMBOLS = ["TabmixPlacesUtils"];
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
diff --git a/modules/RenameTab.jsm b/modules/RenameTab.jsm
index 5880a3d..e69b798 100644
--- a/modules/RenameTab.jsm
+++ b/modules/RenameTab.jsm
@@ -4,8 +4,8 @@ this.EXPORTED_SYMBOLS = ["RenameTab"];
const Cu = Components.utils;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://tabmixplus/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://tabmixplus/Services.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "TabmixPlacesUtils",
"resource://tabmixplus/Places.jsm");
diff --git a/modules/Services.jsm b/modules/Services.jsm
index 1d08a1d..b3daa7b 100644
--- a/modules/Services.jsm
+++ b/modules/Services.jsm
@@ -5,8 +5,8 @@ this.EXPORTED_SYMBOLS = ["TabmixSvc"];
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/Services.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "TabmixPlacesUtils",
"resource://tabmixplus/Places.jsm");
@@ -185,7 +185,7 @@ this.TabmixSvc = {
Services.obs.addObserver(this, "quit-application", true);
// eslint-disable-next-line tabmix/import-globals
- Cu.import("resource://tabmixplus/DownloadLastDir.jsm");
+ Cu.import("resource://tabmixplus/DownloadLastDir.jsm", {});
TabmixPlacesUtils.init(aWindow);
diff --git a/modules/Shortcuts.jsm b/modules/Shortcuts.jsm
index 607a5c2..e72867f 100644
--- a/modules/Shortcuts.jsm
+++ b/modules/Shortcuts.jsm
@@ -4,9 +4,9 @@ this.EXPORTED_SYMBOLS = ["Shortcuts"];
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
const NS_XUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://tabmixplus/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/Services.jsm", this);
+Cu.import("resource://tabmixplus/Services.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
diff --git a/modules/SingleWindowModeUtils.jsm b/modules/SingleWindowModeUtils.jsm
index 469cb92..b2ae143 100644
--- a/modules/SingleWindowModeUtils.jsm
+++ b/modules/SingleWindowModeUtils.jsm
@@ -5,9 +5,9 @@ this.EXPORTED_SYMBOLS = ["SingleWindowModeUtils"];
const {interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://tabmixplus/Services.jsm");
-Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm", this);
+Cu.import("resource://tabmixplus/Services.jsm", this);
+Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm", this);
this.SingleWindowModeUtils = {
/**
diff --git a/modules/Slideshow.jsm b/modules/Slideshow.jsm
index 21ccc44..15cfbd6 100644
--- a/modules/Slideshow.jsm
+++ b/modules/Slideshow.jsm
@@ -4,8 +4,8 @@ this.EXPORTED_SYMBOLS = ["flst"];
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://tabmixplus/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://tabmixplus/Services.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "Shortcuts",
"resource://tabmixplus/Shortcuts.jsm");
diff --git a/modules/TabGroupsMigrator.jsm b/modules/TabGroupsMigrator.jsm
index 61463d8..7f17a4a 100644
--- a/modules/TabGroupsMigrator.jsm
+++ b/modules/TabGroupsMigrator.jsm
@@ -4,7 +4,7 @@ this.EXPORTED_SYMBOLS = ["TabmixGroupsMigrator"];
const {interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
diff --git a/modules/Utils.jsm b/modules/Utils.jsm
index 9430495..0947429 100644
--- a/modules/Utils.jsm
+++ b/modules/Utils.jsm
@@ -14,7 +14,7 @@ const FMM_MESSAGES = [
"Tabmix:contextmenu",
];
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
diff --git a/modules/extensions/AddonManager.jsm b/modules/extensions/AddonManager.jsm
index 10b22dc..b79aebc 100644
--- a/modules/extensions/AddonManager.jsm
+++ b/modules/extensions/AddonManager.jsm
@@ -7,8 +7,8 @@ this.EXPORTED_SYMBOLS = ["TabmixAddonManager"];
const Cu = Components.utils;
-Cu.import("resource://gre/modules/AddonManager.jsm");
-Cu.import("resource://tabmixplus/Services.jsm");
+Cu.import("resource://gre/modules/AddonManager.jsm", this);
+Cu.import("resource://tabmixplus/Services.jsm", this);
const GOOGLE_REGEXP = /http(s)?:\/\/((www|encrypted|news|images)\.)?google\.(.*?)\/url\?/;
const GOOGLE_IMGRES_REGEXP = /http(s)?:\/\/(.*?\.)?google\.(.*?)\/imgres\?/;
diff --git a/modules/extensions/CompatibilityCheck.jsm b/modules/extensions/CompatibilityCheck.jsm
index 4a60c66..e128785 100644
--- a/modules/extensions/CompatibilityCheck.jsm
+++ b/modules/extensions/CompatibilityCheck.jsm
@@ -21,9 +21,9 @@ const TMP_CHECKBOX_UNCHECKED = 0;
const TMP_CHECKBOX_CHECKED = 1;
const TMP_HIDE_CHECKBOX = 2;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/AddonManager.jsm");
-Cu.import("resource://tabmixplus/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/AddonManager.jsm", this);
+Cu.import("resource://tabmixplus/Services.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
diff --git a/modules/log.jsm b/modules/log.jsm
index bccf526..6b98ac3 100644
--- a/modules/log.jsm
+++ b/modules/log.jsm
@@ -4,8 +4,8 @@ this.EXPORTED_SYMBOLS = ["console"];
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm", this);
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
XPCOMUtils.defineLazyGetter(this, "OS", function() {
return Cu.import("resource://gre/modules/osfile.jsm", {}).OS;
--
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