diff options
Diffstat (limited to 'js/vapi-tabs.js')
| -rw-r--r-- | js/vapi-tabs.js | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/js/vapi-tabs.js b/js/vapi-tabs.js index 97d0f69..0e71358 100644 --- a/js/vapi-tabs.js +++ b/js/vapi-tabs.js @@ -35,8 +35,6 @@ let vAPI = self.vAPI; // Guaranteed to be initialized by vapi-background.js - vAPI.noTabId = '-1'; - vAPI.tabs = {}; vAPI.tabs.registerListeners = function() { @@ -94,8 +92,8 @@ return; } - let win = getOwnerWindow(browser); - let tabBrowser = getTabBrowser(win); + let win = vAPI.browser.getOwnerWindow(browser); + let tabBrowser = vAPI.browser.getTabBrowser(win); callback({ id: tabId, @@ -116,7 +114,7 @@ continue; } - let tabBrowser = getTabBrowser(win); + let tabBrowser = vAPI.browser.getTabBrowser(win); if (tabBrowser === null) { continue; } @@ -230,7 +228,7 @@ } let win = vAPI.window.getCurrentWindow(); - let tabBrowser = getTabBrowser(win); + let tabBrowser = vAPI.browser.getTabBrowser(win); if (tabBrowser === null) { return; @@ -282,7 +280,9 @@ return; } - removeInternal(tab, getTabBrowser(getOwnerWindow(browser))); + removeInternal(tab, + vAPI.browser.getTabBrowser + (vAPI.browser.getOwnerWindow(browser))); }; vAPI.tabs.reload = function (tabId) { @@ -303,10 +303,10 @@ } // https://github.com/gorhill/uBlock/issues/470 - let win = getOwnerWindow(tab); + let win = vAPI.browser.getOwnerWindow(tab); win.focus(); - let tabBrowser = getTabBrowser(win); + let tabBrowser = vAPI.browser.getTabBrowser(win); if (tabBrowser) { tabBrowser.selectedTab = tab; } @@ -352,12 +352,12 @@ return -1; } - let win = getOwnerWindow(browser); + let win = vAPI.browser.getOwnerWindow(browser); if (!win) { return -1; } - let tabBrowser = getTabBrowser(win); + let tabBrowser = vAPI.browser.getTabBrowser(win); if (tabBrowser === null) { return -1; } @@ -382,12 +382,12 @@ return null; } - let win = getOwnerWindow(browser); + let win = vAPI.browser.getOwnerWindow(browser); if (!win) { return null; } - let tabBrowser = getTabBrowser(win); + let tabBrowser = vAPI.browser.getTabBrowser(win); if (tabBrowser === null) { return null; } @@ -444,7 +444,7 @@ // https://github.com/gorhill/uBlock/issues/399 // getTabBrowser() can return null at browser launch time. - let tabBrowser = getTabBrowser(win); + let tabBrowser = vAPI.browser.getTabBrowser(win); if (tabBrowser === null) { return null; } @@ -523,7 +523,7 @@ }); } - vAPI.setIcon(tabId, getOwnerWindow(target)); + vAPI.setIcon(tabId, vAPI.browser.getOwnerWindow(target)); }; let locationChangedMessageName = location.host + ':locationChanged'; @@ -567,7 +567,7 @@ vAPI.toolbarButton.attachToNewWindow(window); } - let tabBrowser = getTabBrowser(window); + let tabBrowser = vAPI.browser.getTabBrowser(window); if (tabBrowser === null) { return; } @@ -609,7 +609,7 @@ // https://github.com/gorhill/uBlock/issues/763 // Not getting a tab browser should not prevent from // attaching ourself to the window. - let tabBrowser = getTabBrowser(window); + let tabBrowser = vAPI.browser.getTabBrowser(window); if (tabBrowser === null) { return false; } @@ -625,7 +625,7 @@ let onWindowUnload = function (win) { vAPI.contextMenu.unregister(win.document); - let tabBrowser = getTabBrowser(win); + let tabBrowser = vAPI.browser.getTabBrowser(win); if (tabBrowser === null) { return; } @@ -662,7 +662,7 @@ URI = browser.currentURI; // Close extension tabs if (URI.schemeIs('chrome') && URI.host === location.host) { - removeInternal(tab, getTabBrowser(win)); + removeInternal(tab, vAPI.browser.getTabBrowser(win)); } tabId = browserToTabIdMap.get(browser); @@ -682,7 +682,7 @@ for (let win of vAPI.window.getWindows()) { onWindowLoad(win); - tabBrowser = getTabBrowser(win); + tabBrowser = vAPI.browser.getTabBrowser(win); if (tabBrowser === null) { continue; } @@ -732,4 +732,6 @@ tabIdFromTarget: tabIdFromTarget }; })(); + + vAPI.tabs.manager = tabWatcher; })(); |