From 6c93a1924821d0bd9ceabf56641b1f615286adc3 Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Wed, 29 Aug 2018 00:41:26 +0200 Subject: [PATCH] Misc fixes --- js/lib/Comms.js | 2 +- js/lib/ObjectCopy.js | 2 +- js/lib/Settings.js | 24 ++++++++++++++++++++++-- js/modules/ArDetect.js | 5 ++--- js/modules/Resizer.js | 2 -- js/uw.js | 6 +++++- res/popup/popup.html | 8 ++++---- 7 files changed, 35 insertions(+), 14 deletions(-) diff --git a/js/lib/Comms.js b/js/lib/Comms.js index ef8036a..8020ada 100644 --- a/js/lib/Comms.js +++ b/js/lib/Comms.js @@ -255,7 +255,7 @@ class CommsServer { this.sendToAll({cmd: 'reload-settings', newConf: this.settings.active}); } else if (message.cmd === 'set-video-float') { this.sendToActive(message); - this.settings.active.miscFullscreenthis.settings.videoFloat = message.newFloat; + this.settings.active.miscFullscreenSettings.videoFloat = message.newFloat; this.settings.save(); this.sendToAll({cmd: 'reload-settings', newConf: this.settings.active}); diff --git a/js/lib/ObjectCopy.js b/js/lib/ObjectCopy.js index 4af301d..43242da 100644 --- a/js/lib/ObjectCopy.js +++ b/js/lib/ObjectCopy.js @@ -5,7 +5,7 @@ class ObjectCopy { var out = JSON.parse(JSON.stringify(target)); if(! existing) { - if(Settings.debug) { + if(Debug.debug) { console.log("[ObjectCopy::addNew] There's no existing value. Returning target value."); } diff --git a/js/lib/Settings.js b/js/lib/Settings.js index b34ecf6..36dfb65 100644 --- a/js/lib/Settings.js +++ b/js/lib/Settings.js @@ -10,10 +10,28 @@ class Settings { if(BrowserDetect.firefox) { browser.storage.onChanged.addListener( (changes, area) => { + if (Debug.debug) { + console.log("[Settings::] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area); + if (changes['uwSettings'] && changes['uwSettings'].newValue) { + console.log("[Settings::] new settings object:", JSON.parse(changes.uwSettings.newValue)); + } + } if(changes['uwSettings'] && changes['uwSettings'].newValue) { ths.active = JSON.parse(changes.uwSettings.newValue); } }); + } else if (BrowserDetect.chrome) { + chrome.storage.onChanged.addListener( (changes, area) => { + if (Debug.debug) { + console.log("[Settings::] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area); + if (changes['uwSettings'] && changes['uwSettings'].newValue) { + console.log("[Settings::] new settings object:", JSON.parse(changes.uwSettings.newValue)); + } + } + if(changes['uwSettings'] && changes['uwSettings'].newValue) { + ths.active = JSON.parse(changes.uwSettings.newValue); + } + }) } } @@ -76,7 +94,9 @@ class Settings { return undefined; } } else if (BrowserDetect.chrome) { - const ret = chrome.storage.sync.get('uwSettings'); + const ret = new Promise( (resolve, reject) => { + chrome.storage.sync.get('uwSettings', (res) => resolve(res)); + }); return ret['uwSettings']; } } @@ -90,7 +110,7 @@ class Settings { extensionConf.version = this.version; return this.useSync ? browser.storage.sync.set( {'uwSettings': JSON.stringify(extensionConf)}): browser.storage.local.set( {'uwSettings': JSON.stringify(extensionConf)}); } else if (BrowserDetect.chrome) { - return chrome.storage.sync.set( {'uwSettings': extensionConf}); + return chrome.storage.sync.set( {'uwSettings': JSON.stringify(extensionConf)}); } } diff --git a/js/modules/ArDetect.js b/js/modules/ArDetect.js index 6e83f65..5cd5c55 100644 --- a/js/modules/ArDetect.js +++ b/js/modules/ArDetect.js @@ -235,7 +235,6 @@ class ArDetector { } var e = await this.settings.get(); - console.log("settings?", this.settings.active, e); // run anything that needs to be run after frame check this.postFrameCheck(); @@ -477,9 +476,9 @@ class ArDetector { var newCanvasWidth = window.innerHeight * (this.video.videoWidth / this.video.videoHeight); var newCanvasHeight = window.innerHeight; - if(this.settings.active.miscFullscreenthis.settings.videoFloat == "center") + if(this.settings.active.miscFullscreenSettings.videoFloat == "center") this.canvasDrawWindowHOffset = Math.round((window.innerWidth - newCanvasWidth) * 0.5); - else if(this.settings.active.miscFullscreenthis.settings.videFloat == "left") + else if(this.settings.active.miscFullscreenSettings.videFloat == "left") this.canvasDrawWindowHOffset = 0; else this.canvasDrawWindowHOffset = window.innerWidth - newCanvasWidth; diff --git a/js/modules/Resizer.js b/js/modules/Resizer.js index 47274d6..c5ce77d 100644 --- a/js/modules/Resizer.js +++ b/js/modules/Resizer.js @@ -158,8 +158,6 @@ class Resizer { return; } - console.log("shcedulasdasdasds") - if(this.cssWatcherTimeout) { clearTimeout(this.cssWatcherTimer); } diff --git a/js/uw.js b/js/uw.js index f747f2a..3d044ff 100644 --- a/js/uw.js +++ b/js/uw.js @@ -56,7 +56,11 @@ async function init(){ return; } - pageInfo = new PageInfo(comms, settings); + try { + pageInfo = new PageInfo(comms, settings); + } catch (e) { + console.log("[uw::init] FAILED TO START EXTENSION. Error:", e); + } if(Debug.debug){ console.log("[uw.js::setup] pageInfo initialized. Here's the object:", pageInfo); diff --git a/res/popup/popup.html b/res/popup/popup.html index 113512a..63f5ef2 100644 --- a/res/popup/popup.html +++ b/res/popup/popup.html @@ -148,9 +148,9 @@
Options for this site:
- Blacklist - Default Whitelist + Default + Blacklist
@@ -171,9 +171,9 @@
Options for this site:
- Blacklist - Default Whitelist + Default + Blacklist