Make components and Services.jsm global

Once again, but this time it works.

12 files changed, 3 insertions, 34 deletions

diff --git a/js/vapi-background.js b/js/vapi-background.js
index ed70fe2..6100c18 100644
--- a/js/vapi-background.js
+++ b/js/vapi-background.js
@@ -31,8 +31,6 @@
 /******************************************************************************/
 
 (function () {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
     Cu.import('chrome://ematrix/content/HttpRequestHeaders.jsm');
 
     // Icon-related stuff
diff --git a/js/vapi-browser.js b/js/vapi-browser.js
index 6b8a846..b3c9a5f 100644
--- a/js/vapi-browser.js
+++ b/js/vapi-browser.js
@@ -26,9 +26,6 @@
 /******************************************************************************/
 
 (function () {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
-
     vAPI.browser = {};
     
     vAPI.browser.getTabBrowser = function (win) {
diff --git a/js/vapi-cloud.js b/js/vapi-cloud.js
index f7c47a2..90b077e 100644
--- a/js/vapi-cloud.js
+++ b/js/vapi-cloud.js
@@ -26,9 +26,6 @@
 /******************************************************************************/
 
 (function () {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
-
     vAPI.cloud = (function () {
 	let extensionBranchPath = 'extensions.' + location.host;
 	let cloudBranchPath = extensionBranchPath + '.cloudStorage';
diff --git a/js/vapi-common.js b/js/vapi-common.js
index 473ad89..b7c5635 100644
--- a/js/vapi-common.js
+++ b/js/vapi-common.js
@@ -27,10 +27,10 @@
 
 let vAPI = {};
 
-(function (self) {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
+const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+Cu.import('resource://gre/modules/Services.jsm');
 
+(function (self) {
     vAPI.setTimeout = vAPI.setTimeout || function (callback, delay, extra) {
 	return setTimeout(function (a) {
 	    callback(a);
diff --git a/js/vapi-contextmenu.js b/js/vapi-contextmenu.js
index 5815d78..b0f8694 100644
--- a/js/vapi-contextmenu.js
+++ b/js/vapi-contextmenu.js
@@ -26,9 +26,6 @@
 /******************************************************************************/
 
 (function () {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
-
     vAPI.contextMenu = {
 	contextMap: {
             frame: 'inFrame',
diff --git a/js/vapi-cookies.js b/js/vapi-cookies.js
index 21f5d2e..ff36d97 100644
--- a/js/vapi-cookies.js
+++ b/js/vapi-cookies.js
@@ -26,9 +26,6 @@
 /******************************************************************************/
 
 (function () {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
-
     vAPI.cookies = {};
 
     vAPI.cookies.CookieEntry = function (ffCookie) {
diff --git a/js/vapi-core.js b/js/vapi-core.js
index 620faf2..0c907f7 100644
--- a/js/vapi-core.js
+++ b/js/vapi-core.js
@@ -26,9 +26,6 @@
 /******************************************************************************/
 
 (function (self) {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
-
     vAPI.modernFirefox =
 	Services.appinfo.ID === '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}'
 	&& Services.vc.compare(Services.appinfo.version, '44') > 0;
diff --git a/js/vapi-messaging.js b/js/vapi-messaging.js
index b320a27..d0a3333 100644
--- a/js/vapi-messaging.js
+++ b/js/vapi-messaging.js
@@ -26,8 +26,6 @@
 /******************************************************************************/
 
 (function () {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
     Cu.import('chrome://ematrix/content/CallbackWrapper.jsm');
     
     vAPI.messaging = {
diff --git a/js/vapi-net.js b/js/vapi-net.js
index ee52945..7accbc0 100644
--- a/js/vapi-net.js
+++ b/js/vapi-net.js
@@ -26,9 +26,6 @@
 /******************************************************************************/
 
 (function () {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
-
     vAPI.net = {};
 
     vAPI.net.registerListeners = function () {
diff --git a/js/vapi-storage.js b/js/vapi-storage.js
index ce4ab72..7aa873c 100644
--- a/js/vapi-storage.js
+++ b/js/vapi-storage.js
@@ -26,9 +26,6 @@
 /******************************************************************************/
 
 (function () {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
-
     // API matches that of chrome.storage.local:
     // https://developer.chrome.com/extensions/storage
     vAPI.storage = (function () {
diff --git a/js/vapi-tabs.js b/js/vapi-tabs.js
index d36800a..d88d184 100644
--- a/js/vapi-tabs.js
+++ b/js/vapi-tabs.js
@@ -26,9 +26,6 @@
 /******************************************************************************/
 
 (function () {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
-
     vAPI.tabs = {};
 
     vAPI.tabs.registerListeners = function() {
diff --git a/js/vapi-window.js b/js/vapi-window.js
index e7e5e50..e01dc7a 100644
--- a/js/vapi-window.js
+++ b/js/vapi-window.js
@@ -26,9 +26,6 @@
 /******************************************************************************/
 
 (function () {
-    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-    Cu.import('resource://gre/modules/Services.jsm');
-
     vAPI.window = (function () {
 	let windowToIdMap = new Map();
 	let windowIdGenerator = 1;