tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using tabs API to acquire URL of current tab

Browse Source
This commit is contained in:
Tamius Han 2018-09-20 21:45:09 +02:00
parent e05eb27e6a
commit d1d8945aac
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/lib/Comms.js
View File

@ -128,10 +128,6 @@ class CommsClient {
return Promise.resolve(true); return Promise.resolve(true);
} }
registerTab() {
this.port.postMessage({cmd: "register-tab", url: location.hostname});
}
registerVideo(){ registerVideo(){
this.port.postMessage({cmd: "has-video"}); this.port.postMessage({cmd: "has-video"});
} }
@ -192,7 +188,7 @@ class CommsServer {
return await browser.tabs.query({currentWindow: true, active: true}); return await browser.tabs.query({currentWindow: true, active: true});
} else { } else {
return await new Promise( (resolve, reject) => { return await new Promise( (resolve, reject) => {
chrome.tabs.query({currentWindow: true, active: true}, function (res) { chrome.tabs.query({lastFocusedWindow: true, active: true}, function (res) {
resolve(res); resolve(res);
}); });
}); });
@ -250,26 +246,7 @@ class CommsServer {
} }
if(message.cmd === 'get-current-site') { if(message.cmd === 'get-current-site') {
port.postMessage({cmd: 'set-current-site', site: this.server.currentSite}); port.postMessage({cmd: 'set-current-site', site: await this.getCurrentTabHostname()});
}
if(message.cmd === 'register-tab') {
if(Debug.debug) { // we want to get these messages always when debugging
console.log("[Comms::processReceivedMessage] registering tab with hostname", message.url)
}
const currentUrl = await this.getCurrentTabHostname();
if (message.url === currentUrl) {
this.server.currentSite = message.url;
if(Debug.debug) { // we want to get these messages always when debugging
console.log("[Comms::processReceivedMessage] hostname matches currently active tab. active:", currentUrl, "message:", message.url);
}
} else {
if(Debug.debug) { // we want to get these messages always when debugging
console.log("[Comms::processReceivedMessage] hostnames don't match. active:", currentUrl, "message:", message.url);
}
}
} }
if (message.cmd === 'get-config') { if (message.cmd === 'get-config') {
@ -349,7 +326,7 @@ class CommsServer {
} }
if(message.cmd === 'get-config') { if(message.cmd === 'get-config') {
sendResponse({extensionConf: JSON.stringify(this.settings.active), site: getCurrentTabUrl()}); sendResponse({extensionConf: JSON.stringify(this.settings.active), site: this.getCurrentTabHostname()});
// return true; // return true;
} else if (message.cmd === "autoar-enable") { } else if (message.cmd === "autoar-enable") {
this.settings.active.arDetect.mode = "blacklist"; this.settings.active.arDetect.mode = "blacklist";

3
js/modules/PageInfo.js
View File

@ -21,8 +21,6 @@ class PageInfo {
console.log("registering video") console.log("registering video")
comms.registerVideo(); comms.registerVideo();
} }
comms.registerTab();
} }
destroy() { destroy() {
@ -175,7 +173,6 @@ class PageInfo {
this.rescan(RescanReason.URL_CHANGE); this.rescan(RescanReason.URL_CHANGE);
this.lastUrl = window.location.href; this.lastUrl = window.location.href;
this.comms.registerTab();
} }
this.scheduleUrlCheck(); this.scheduleUrlCheck();