Minor refactoring

3 files changed, 20 insertions, 21 deletions

diff --git a/js/vapi-background.js b/js/vapi-background.js
index d03a205..4cfebb8 100644
--- a/js/vapi-background.js
+++ b/js/vapi-background.js
@@ -34,7 +34,7 @@
     const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
     const {Services} = Cu.import('resource://gre/modules/Services.jsm', null);
 
-    let vAPI = self.vAPI = self.vAPI || {};
+    let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-core.js
     
     vAPI.modernFirefox =
 	Services.appinfo.ID === '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}'
diff --git a/js/vapi-tabs.js b/js/vapi-tabs.js
index 0e71358..1c56cfb 100644
--- a/js/vapi-tabs.js
+++ b/js/vapi-tabs.js
@@ -38,7 +38,7 @@
     vAPI.tabs = {};
 
     vAPI.tabs.registerListeners = function() {
-	tabWatcher.start();
+	vAPI.tabs.manager.start();
     };
 
     vAPI.tabs.get = function (tabId, callback) {
@@ -76,10 +76,10 @@
 	let browser;
 
 	if (tabId === null) {
-            browser = tabWatcher.currentBrowser();
-            tabId = tabWatcher.tabIdFromTarget(browser);
+            browser = vAPI.tabs.manager.currentBrowser();
+            tabId = vAPI.tabs.manager.tabIdFromTarget(browser);
 	} else {
-            browser = tabWatcher.browserFromTabId(tabId);
+            browser = vAPI.tabs.manager.browserFromTabId(tabId);
 	}
 
 	// For internal use
@@ -137,8 +137,8 @@
     vAPI.tabs.getAll = function (callback) {
 	let tabs = [];
 
-	for (let browser of tabWatcher.browsers()) {
-            let tab = tabWatcher.tabFromBrowser(browser);
+	for (let browser of vAPI.tabs.manager.browsers()) {
+            let tab = vAPI.tabs.manager.tabFromBrowser(browser);
 	    
             if (tab === null) {
 		continue;
@@ -149,7 +149,7 @@
             }
 	    
             tabs.push({
-		id: tabWatcher.tabIdFromTarget(browser),
+		id: vAPI.tabs.manager.tabIdFromTarget(browser),
 		url: browser.currentURI.asciiSpec
             });
 	}
@@ -180,7 +180,7 @@
             let URI = Services.io.newURI(details.url, null, null);
 
             for (let tab of this.getAllSync()) {
-		let browser = tabWatcher.browserFromTarget(tab);
+		let browser = vAPI.tabs.manager.browserFromTarget(tab);
 		
 		// https://github.com/gorhill/uBlock/issues/2558
 		if (browser === null) {
@@ -208,10 +208,10 @@
 	}
 
 	if (details.tabId) {
-            let tab = tabWatcher.browserFromTabId(details.tabId);
+            let tab = vAPI.tabs.manager.browserFromTabId(details.tabId);
 	    
             if (tab) {
-		tabWatcher.browserFromTarget(tab).loadURI(details.url);
+		vAPI.tabs.manager.browserFromTarget(tab).loadURI(details.url);
 		return;
             }
 	}
@@ -257,7 +257,7 @@
             targetURL = vAPI.getURL(targetURL);
 	}
 
-	let browser = tabWatcher.browserFromTabId(tabId);
+	let browser = vAPI.tabs.manager.browserFromTabId(tabId);
 	if (browser) {
             browser.loadURI(targetURL);
 	}
@@ -270,12 +270,12 @@
     }
 
     vAPI.tabs.remove = function (tabId) {
-	let browser = tabWatcher.browserFromTabId(tabId);
+	let browser = vAPI.tabs.manager.browserFromTabId(tabId);
 	if (!browser) {
             return;
 	}
 	
-	let tab = tabWatcher.tabFromBrowser(browser);
+	let tab = vAPI.tabs.manager.tabFromBrowser(browser);
 	if (!tab) {
             return;
 	}
@@ -286,7 +286,7 @@
     };
 
     vAPI.tabs.reload = function (tabId) {
-	let browser = tabWatcher.browserFromTabId(tabId);
+	let browser = vAPI.tabs.manager.browserFromTabId(tabId);
 	if (!browser) {
             return;
 	}
@@ -296,7 +296,8 @@
 
     vAPI.tabs.select = function (tab) {
 	if (typeof tab !== 'object') {
-            tab = tabWatcher.tabFromBrowser(tabWatcher.browserFromTabId(tab));
+            tab = vAPI.tabs.manager
+		.tabFromBrowser(vAPI.tabs.manager.browserFromTabId(tab));
 	}
 	if (!tab) {
             return;
@@ -313,7 +314,7 @@
     };
 
     vAPI.tabs.injectScript = function (tabId, details, callback) {
-	let browser = tabWatcher.browserFromTabId(tabId);
+	let browser = vAPI.tabs.manager.browserFromTabId(tabId);
 	if (!browser) {
             return;
 	}
@@ -338,7 +339,7 @@
 	}
     };
 
-    let tabWatcher = (function () {
+    vAPI.tabs.manager = (function () {
 	// TODO: find out whether we need a janitor to take care of stale entries.
 
 	// https://github.com/gorhill/uMatrix/issues/540
@@ -732,6 +733,4 @@
             tabIdFromTarget: tabIdFromTarget
 	};
     })();
-
-    vAPI.tabs.manager = tabWatcher;
 })();
diff --git a/js/vapi-window.js b/js/vapi-window.js
index ff0e9fe..ab57e35 100644
--- a/js/vapi-window.js
+++ b/js/vapi-window.js
@@ -32,7 +32,7 @@
     const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
     const {Services} = Cu.import('resource://gre/modules/Services.jsm', null);
 
-    let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-background.js
+    let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-core.js
 
     vAPI.window = (function () {
 	let windowToIdMap = new Map();