Revert "Make components and services global"

This reverts commit 51f5e899fff9e804d9c91e4fefdd57ea5a85e99c.

It seems to cause issues with the popup menu.

11 files changed, 31 insertions, 3 deletions

diff --git a/js/vapi-background.js b/js/vapi-background.js
index 9df1dbb..067707c 100644
--- a/js/vapi-background.js
+++ b/js/vapi-background.js
@@ -31,6 +31,8 @@
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
     Cu.import('chrome://ematrix/content/HttpRequestHeaders.jsm');
 
     let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-core.js
diff --git a/js/vapi-browser.js b/js/vapi-browser.js
index 4828b3d..07d954b 100644
--- a/js/vapi-browser.js
+++ b/js/vapi-browser.js
@@ -26,6 +26,9 @@
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
+
     let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-background.js
 
     vAPI.browser = {};
diff --git a/js/vapi-cloud.js b/js/vapi-cloud.js
index e4e3092..b3d1b80 100644
--- a/js/vapi-cloud.js
+++ b/js/vapi-cloud.js
@@ -26,6 +26,9 @@
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
+
     let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-background.js
 
     vAPI.cloud = (function () {
diff --git a/js/vapi-contextmenu.js b/js/vapi-contextmenu.js
index 3cdfe20..34c4263 100644
--- a/js/vapi-contextmenu.js
+++ b/js/vapi-contextmenu.js
@@ -26,6 +26,9 @@
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
+
     let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-background.js
 
     vAPI.contextMenu = {
diff --git a/js/vapi-cookies.js b/js/vapi-cookies.js
index 9211c48..1f19c49 100644
--- a/js/vapi-cookies.js
+++ b/js/vapi-cookies.js
@@ -26,6 +26,9 @@
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
+
     let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-background.js
 
     vAPI.cookies = {};
diff --git a/js/vapi-core.js b/js/vapi-core.js
index 3901c1c..c904ff2 100644
--- a/js/vapi-core.js
+++ b/js/vapi-core.js
@@ -23,12 +23,12 @@
 
 'use strict';
 
-const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-Cu.import('resource://gre/modules/Services.jsm');
-
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
+
     let vAPI = self.vAPI = self.vAPI || {};
 
     vAPI.modernFirefox =
diff --git a/js/vapi-messaging.js b/js/vapi-messaging.js
index 0df2362..170e85d 100644
--- a/js/vapi-messaging.js
+++ b/js/vapi-messaging.js
@@ -26,6 +26,8 @@
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
     Cu.import('chrome://ematrix/content/CallbackWrapper.jsm');
 
     let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-background.js
diff --git a/js/vapi-net.js b/js/vapi-net.js
index 6f7e885..25de1cb 100644
--- a/js/vapi-net.js
+++ b/js/vapi-net.js
@@ -26,6 +26,9 @@
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
+
     let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-background.js
 
     vAPI.net = {};
diff --git a/js/vapi-storage.js b/js/vapi-storage.js
index 6dbb955..6a6cb3b 100644
--- a/js/vapi-storage.js
+++ b/js/vapi-storage.js
@@ -26,6 +26,9 @@
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
+
     let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-background.js
 
     // API matches that of chrome.storage.local:
diff --git a/js/vapi-tabs.js b/js/vapi-tabs.js
index 6e953f2..54b09d0 100644
--- a/js/vapi-tabs.js
+++ b/js/vapi-tabs.js
@@ -26,6 +26,9 @@
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
+
     let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-background.js
 
     vAPI.tabs = {};
diff --git a/js/vapi-window.js b/js/vapi-window.js
index 9cb245d..07fb80c 100644
--- a/js/vapi-window.js
+++ b/js/vapi-window.js
@@ -26,6 +26,9 @@
 /******************************************************************************/
 
 (function () {
+    const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+    Cu.import('resource://gre/modules/Services.jsm');
+
     let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-core.js
 
     vAPI.window = (function () {