[Pkg-mozext-commits] [tabmixplus] 25/147: Rename tabmixplus/Services.jsm to tabmixplus/TabmixSvc.jsm so our eslint plugin rule 'import-globals' get the global name TabmixSvc instead of Services

David Prévot taffit at moszumanska.debian.org
Sat Aug 5 15:27:33 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 651bee36443a32febe3567d4f6cd7fdb1478f69d
Author: onemen <tabmix.onemen at gmail.com>
Date:   Thu Nov 3 21:20:59 2016 +0200

    Rename tabmixplus/Services.jsm to tabmixplus/TabmixSvc.jsm so our eslint plugin rule 'import-globals' get the global name TabmixSvc instead of Services
---
 chrome/content/preferences/overlay/preferences.xml       | 2 +-
 chrome/content/preferences/overlay/preferencesOverlay.js | 2 +-
 chrome/content/scripts/content.js                        | 2 +-
 chrome/content/utils.js                                  | 2 +-
 modules/AboutNewTab.jsm                                  | 2 +-
 modules/AutoReload.jsm                                   | 2 +-
 modules/ContentClick.jsm                                 | 2 +-
 modules/DocShellCapabilities.jsm                         | 2 +-
 modules/DynamicRules.jsm                                 | 2 +-
 modules/MergeWindows.jsm                                 | 2 +-
 modules/NewTabURL.jsm                                    | 2 +-
 modules/Places.jsm                                       | 2 +-
 modules/RenameTab.jsm                                    | 2 +-
 modules/Shortcuts.jsm                                    | 2 +-
 modules/SingleWindowModeUtils.jsm                        | 2 +-
 modules/Slideshow.jsm                                    | 2 +-
 modules/TabGroupsMigrator.jsm                            | 2 +-
 modules/{Services.jsm => TabmixSvc.jsm}                  | 0
 modules/Utils.jsm                                        | 2 +-
 modules/extensions/AddonManager.jsm                      | 2 +-
 modules/extensions/CompatibilityCheck.jsm                | 2 +-
 21 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/chrome/content/preferences/overlay/preferences.xml b/chrome/content/preferences/overlay/preferences.xml
index 4079d6b..c3b0ae0 100644
--- a/chrome/content/preferences/overlay/preferences.xml
+++ b/chrome/content/preferences/overlay/preferences.xml
@@ -14,7 +14,7 @@
           // we call this from here to apply the changes to all dialog windows
           // that are based on prefwindow
           try {
-            Components.utils.import("resource://tabmixplus/Services.jsm");
+            Components.utils.import("resource://tabmixplus/TabmixSvc.jsm");
             window.Tabmix = { };
             Tabmix._debugMode = false;
             Services.scriptloader.loadSubScript("chrome://tabmixplus/content/changecode.js", Tabmix);
diff --git a/chrome/content/preferences/overlay/preferencesOverlay.js b/chrome/content/preferences/overlay/preferencesOverlay.js
index 772484e..8f30ae2 100644
--- a/chrome/content/preferences/overlay/preferencesOverlay.js
+++ b/chrome/content/preferences/overlay/preferencesOverlay.js
@@ -1,7 +1,7 @@
 /* exported gTabMix_preferencesOverlay */
 "use strict";
 
-Components.utils.import("resource://tabmixplus/Services.jsm");
+Components.utils.import("resource://tabmixplus/TabmixSvc.jsm");
 
 var gTabMix_preferencesOverlay = {
   id: function(id) {
diff --git a/chrome/content/scripts/content.js b/chrome/content/scripts/content.js
index e101798..e183330 100644
--- a/chrome/content/scripts/content.js
+++ b/chrome/content/scripts/content.js
@@ -21,7 +21,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
   "resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixSvc",
-  "resource://tabmixplus/Services.jsm");
+  "resource://tabmixplus/TabmixSvc.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "LinkNodeUtils",
   "resource://tabmixplus/LinkNodeUtils.jsm");
diff --git a/chrome/content/utils.js b/chrome/content/utils.js
index 441a8af..f321ca2 100644
--- a/chrome/content/utils.js
+++ b/chrome/content/utils.js
@@ -274,4 +274,4 @@ var Tabmix = {
 };
 
 Tabmix._init();
-Tabmix.lazy_import(window, "TabmixSvc", "Services", "TabmixSvc");
+Tabmix.lazy_import(window, "TabmixSvc", "TabmixSvc", "TabmixSvc");
diff --git a/modules/AboutNewTab.jsm b/modules/AboutNewTab.jsm
index 49d0528..c88128b 100644
--- a/modules/AboutNewTab.jsm
+++ b/modules/AboutNewTab.jsm
@@ -16,7 +16,7 @@ XPCOMUtils.defineLazyGetter(this, "gAllPages", () => {
 });
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixSvc",
-  "resource://tabmixplus/Services.jsm");
+  "resource://tabmixplus/TabmixSvc.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixPlacesUtils",
   "resource://tabmixplus/Places.jsm");
diff --git a/modules/AutoReload.jsm b/modules/AutoReload.jsm
index ccc7a22..fcc10d6 100644
--- a/modules/AutoReload.jsm
+++ b/modules/AutoReload.jsm
@@ -5,7 +5,7 @@ this.EXPORTED_SYMBOLS = ["AutoReload"];
 const {interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/Services.jsm", this);
-Cu.import("resource://tabmixplus/Services.jsm", this);
+Cu.import("resource://tabmixplus/TabmixSvc.jsm", this);
 
 var _setItem = function() {};
 
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index a0f1655..bbef3a9 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -22,7 +22,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "LinkNodeUtils",
   "resource://tabmixplus/LinkNodeUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixSvc",
-  "resource://tabmixplus/Services.jsm");
+  "resource://tabmixplus/TabmixSvc.jsm");
 
 var ContentClickInternal;
 this.TabmixContentClick = {
diff --git a/modules/DocShellCapabilities.jsm b/modules/DocShellCapabilities.jsm
index b4ced1b..f667c3a 100644
--- a/modules/DocShellCapabilities.jsm
+++ b/modules/DocShellCapabilities.jsm
@@ -11,7 +11,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "TabState",
 XPCOMUtils.defineLazyModuleGetter(this, "TabStateCache",
   "resource:///modules/sessionstore/TabStateCache.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixSvc",
-  "resource://tabmixplus/Services.jsm");
+  "resource://tabmixplus/TabmixSvc.jsm");
 
 this.DocShellCapabilities = {
   init: function() {
diff --git a/modules/DynamicRules.jsm b/modules/DynamicRules.jsm
index a054651..9438cfe 100644
--- a/modules/DynamicRules.jsm
+++ b/modules/DynamicRules.jsm
@@ -10,7 +10,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Services",
   "resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixSvc",
-  "resource://tabmixplus/Services.jsm");
+  "resource://tabmixplus/TabmixSvc.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "Prefs", () => {
   return Services.prefs.getBranch("extensions.tabmix.styles.");
diff --git a/modules/MergeWindows.jsm b/modules/MergeWindows.jsm
index c9bd572..18fd07a 100644
--- a/modules/MergeWindows.jsm
+++ b/modules/MergeWindows.jsm
@@ -6,7 +6,7 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/Services.jsm", this);
-Cu.import("resource://tabmixplus/Services.jsm", this);
+Cu.import("resource://tabmixplus/TabmixSvc.jsm", this);
 
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
   "resource://gre/modules/PrivateBrowsingUtils.jsm");
diff --git a/modules/NewTabURL.jsm b/modules/NewTabURL.jsm
index 89395c9..1e353f6 100644
--- a/modules/NewTabURL.jsm
+++ b/modules/NewTabURL.jsm
@@ -15,7 +15,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "NewTabURL",
   "resource:///modules/NewTabURL.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixSvc",
-  "resource://tabmixplus/Services.jsm");
+  "resource://tabmixplus/TabmixSvc.jsm");
 
 const FIREFOX_PREF = "browser.#.url".replace("#", "newtab");
 const ABOUT_NEW_TAB = "about:#".replace("#", "newtab");
diff --git a/modules/Places.jsm b/modules/Places.jsm
index 4e6509a..3ee308b 100644
--- a/modules/Places.jsm
+++ b/modules/Places.jsm
@@ -25,7 +25,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
   "resource://gre/modules/PlacesUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this,
-  "TabmixSvc", "resource://tabmixplus/Services.jsm");
+  "TabmixSvc", "resource://tabmixplus/TabmixSvc.jsm");
 
 var PlacesUtilsInternal;
 this.TabmixPlacesUtils = Object.freeze({
diff --git a/modules/RenameTab.jsm b/modules/RenameTab.jsm
index e69b798..393a8a6 100644
--- a/modules/RenameTab.jsm
+++ b/modules/RenameTab.jsm
@@ -5,7 +5,7 @@ this.EXPORTED_SYMBOLS = ["RenameTab"];
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
-Cu.import("resource://tabmixplus/Services.jsm", this);
+Cu.import("resource://tabmixplus/TabmixSvc.jsm", this);
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixPlacesUtils",
   "resource://tabmixplus/Places.jsm");
diff --git a/modules/Shortcuts.jsm b/modules/Shortcuts.jsm
index 26c5dc8..60d1cad 100644
--- a/modules/Shortcuts.jsm
+++ b/modules/Shortcuts.jsm
@@ -6,7 +6,7 @@ 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", this);
 Cu.import("resource://gre/modules/Services.jsm", this);
-Cu.import("resource://tabmixplus/Services.jsm", this);
+Cu.import("resource://tabmixplus/TabmixSvc.jsm", this);
 
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
   "resource://gre/modules/PrivateBrowsingUtils.jsm");
diff --git a/modules/SingleWindowModeUtils.jsm b/modules/SingleWindowModeUtils.jsm
index be91c57..e94ecc9 100644
--- a/modules/SingleWindowModeUtils.jsm
+++ b/modules/SingleWindowModeUtils.jsm
@@ -6,7 +6,7 @@ this.EXPORTED_SYMBOLS = ["SingleWindowModeUtils"];
 const {interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/Services.jsm", this);
-Cu.import("resource://tabmixplus/Services.jsm", this);
+Cu.import("resource://tabmixplus/TabmixSvc.jsm", this);
 Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm", this);
 
 this.SingleWindowModeUtils = {
diff --git a/modules/Slideshow.jsm b/modules/Slideshow.jsm
index a5472b2..9023da8 100644
--- a/modules/Slideshow.jsm
+++ b/modules/Slideshow.jsm
@@ -5,7 +5,7 @@ this.EXPORTED_SYMBOLS = ["flst"];
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
-Cu.import("resource://tabmixplus/Services.jsm", this);
+Cu.import("resource://tabmixplus/TabmixSvc.jsm", this);
 XPCOMUtils.defineLazyModuleGetter(this, "Shortcuts",
   "resource://tabmixplus/Shortcuts.jsm");
 
diff --git a/modules/TabGroupsMigrator.jsm b/modules/TabGroupsMigrator.jsm
index d465eac..262f968 100644
--- a/modules/TabGroupsMigrator.jsm
+++ b/modules/TabGroupsMigrator.jsm
@@ -35,7 +35,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
   "resource://gre/modules/AsyncShutdown.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixSvc",
-  "resource://tabmixplus/Services.jsm");
+  "resource://tabmixplus/TabmixSvc.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixPlacesUtils",
   "resource://tabmixplus/Places.jsm");
diff --git a/modules/Services.jsm b/modules/TabmixSvc.jsm
similarity index 100%
rename from modules/Services.jsm
rename to modules/TabmixSvc.jsm
diff --git a/modules/Utils.jsm b/modules/Utils.jsm
index 4ff92ac..fab4a18 100644
--- a/modules/Utils.jsm
+++ b/modules/Utils.jsm
@@ -19,7 +19,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
   "resource://gre/modules/PrivateBrowsingUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TabmixSvc",
-  "resource://tabmixplus/Services.jsm");
+  "resource://tabmixplus/TabmixSvc.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "DocShellCapabilities",
   "resource://tabmixplus/DocShellCapabilities.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "AutoReload",
diff --git a/modules/extensions/AddonManager.jsm b/modules/extensions/AddonManager.jsm
index 84e9729..da10902 100644
--- a/modules/extensions/AddonManager.jsm
+++ b/modules/extensions/AddonManager.jsm
@@ -8,7 +8,7 @@ this.EXPORTED_SYMBOLS = ["TabmixAddonManager"];
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/AddonManager.jsm", this);
-Cu.import("resource://tabmixplus/Services.jsm", this);
+Cu.import("resource://tabmixplus/TabmixSvc.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 04de308..ce3f037 100644
--- a/modules/extensions/CompatibilityCheck.jsm
+++ b/modules/extensions/CompatibilityCheck.jsm
@@ -23,7 +23,7 @@ const TMP_HIDE_CHECKBOX = 2;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/AddonManager.jsm", this);
-Cu.import("resource://tabmixplus/Services.jsm", this);
+Cu.import("resource://tabmixplus/TabmixSvc.jsm", this);
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
   "resource://gre/modules/Services.jsm");
 

-- 
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