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

Fix settings

Browse Source
This commit is contained in:
Tamius Han 2018-08-22 22:34:07 +02:00
parent 65f385ca11
commit b222ea81c7
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
js/lib/Settings.js
View File

@ -1,9 +1,10 @@
class Settings { class Settings {
constructor(activeSettings) { constructor(activeSettings) {
this.active = activeSettings ? activeSettings : {}; this.active = activeSettings ? activeSettings : undefined;
this.default = ExtensionConf; this.default = ExtensionConf;
this.useSync = false; this.useSync = false;
this.version = undefined;
} }
async init() { async init() {
@ -24,49 +25,58 @@ class Settings {
this.active = settings; this.active = settings;
// check if extension has been updated. If not, return settings as they were retreived // check if extension has been updated. If not, return settings as they were retreived
var uwVersion;
if (BrowserDetect.firefox) { if (BrowserDetect.firefox) {
uwVersion = browser.runtime.getManifest().version; this.version = browser.runtime.getManifest().version;
} else if (BrowserDetect.chrome) { } else if (BrowserDetect.chrome) {
uwVersion = chrome.runtime.getManifest().version; this.version = chrome.runtime.getManifest().version;
} else if (BrowserDetect.edge) { } else if (BrowserDetect.edge) {
uwVersion = browser.runtime.getManifest().version; this.version = browser.runtime.getManifest().version;
} }
if(settings.version === uwVersion) { if(settings.version === this.version) {
if(Debug.debug) { if(Debug.debug) {
console.log("[Settings::init] extension was saved with current version of ultrawidify (", uwVersion, "). Returning object as-is."); console.log("[Settings::init] extension was saved with current version of ultrawidify (", this.version, "). Returning object as-is.");
} }
return this.active; return this.active;
} }
// if extension has been updated, update existing settings with any options added in the // if extension has been updated, update existing settings with any options added in the
// new version. In addition to that, we remove old keys that are no longer used. // new version. In addition to that, we remove old keys that are no longer used.
this.active = ObjectCopy.addNew(settings, this.default); const patched = ObjectCopy.addNew(settings, this.default);
if(Debug.debug) {
console.log("[Settings.init] Results from ObjectCopy.addNew()?", patched, "\n\nSettings from storage", settings, "\ndefault?", this.default,);
}
if(patched){
this.active = patched;
} else {
this.active = JSON.parse(JSON.stringify(this.default));
}
this.set(this.active); this.set(this.active);
return this.active; return this.active;
} }
async get() { async get() {
if (BrowserDetect.firefox || BrowserDetect.edge) { if (BrowserDetect.firefox || BrowserDetect.edge) {
const ret = this.useSync ? await browser.storage.sync.get('uw-settings') : await browser.storage.local.get('uw-settings'); const ret = this.useSync ? await browser.storage.sync.get('uwSettings') : await browser.storage.local.get('uwSettings');
try { try {
return JSON.parse(ret['uw-settings']); return JSON.parse(ret.uwSettings);
} catch(e) { } catch(e) {
return undefined; return undefined;
} }
} else if (BrowserDetect.chrome) { } else if (BrowserDetect.chrome) {
const ret = chrome.storage.sync.get('uw-settings'); const ret = chrome.storage.sync.get('uwSettings');
return ret['uw-settings']; return ret['uwSettings'];
} }
} }
async set(extensionConf) { async set(extensionConf) {
if (BrowserDetect.firefox || BrowserDetect.edge) { if (BrowserDetect.firefox || BrowserDetect.edge) {
return this.useSync ? browser.storage.sync.set( {'uw-settings': JSON.stringify(extensionConf)}): browser.storage.local.set( {'uw-settings': JSON.stringify(extensionConf)}); 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) { } else if (BrowserDetect.chrome) {
return chrome.storage.sync.set( {'uw-settings': extensionConf}); return chrome.storage.sync.set( {'uwSettings': extensionConf});
} }
} }
@ -148,9 +158,12 @@ class Settings {
} else { } else {
return false; return false;
} }
}catch(e){ }catch(e){
console.log("THIS?", this) if(Debug.debug){
} console.log("[Settings.js::canStartExtension] Something went wrong — are settings defined/has init() been called?\nSettings object:", this)
}
return false;
}
} }