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

Add saveWithoutReload() to settings.js

Browse Source
This commit is contained in:
Tamius Han 2019-10-24 00:44:27 +02:00
parent f652bce8fe
commit ab06f0bd41
1 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/ext/lib/Settings.js
View File

@ -26,42 +26,28 @@ class Settings {
const ths = this; const ths = this;
if(currentBrowser.firefox) { if (currentBrowser.firefox) {
browser.storage.onChanged.addListener( (changes, area) => { browser.storage.onChanged.addListener(this.storageChangeListener);
this.logger.log('info', 'settings', "[Settings::<storage/on change>] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area);
if (changes['uwSettings'] && changes['uwSettings'].newValue) {
this.logger.log('info', 'settings',"[Settings::<storage/on change>] new settings object:", JSON.parse(changes.uwSettings.newValue));
}
if(changes['uwSettings'] && changes['uwSettings'].newValue) {
ths.setActive(JSON.parse(changes.uwSettings.newValue));
}
if(this.updateCallback) {
try {
updateCallback(ths);
} catch (e) {
this.logger.log('error', 'settings', "[Settings] CALLING UPDATE CALLBACK FAILED.")
}
}
});
} else if (currentBrowser.chrome) { } else if (currentBrowser.chrome) {
chrome.storage.onChanged.addListener( (changes, area) => { chrome.storage.onChanged.addListener(this.storageChangeListener);
this.logger.log('info', 'settings', "[Settings::<storage/on change>] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area); }
if (changes['uwSettings'] && changes['uwSettings'].newValue) { }
this.logger.log('info', 'settings',"[Settings::<storage/on change>] new settings object:", JSON.parse(changes.uwSettings.newValue));
}
if(changes['uwSettings'] && changes['uwSettings'].newValue) {
ths.setActive(JSON.parse(changes.uwSettings.newValue));
}
if(this.updateCallback) { storageChangeListener(changes, area) {
try { this.logger.log('info', 'settings', "[Settings::<storage/on change>] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area);
updateCallback(ths); if (changes['uwSettings'] && changes['uwSettings'].newValue) {
} catch (e) { this.logger.log('info', 'settings',"[Settings::<storage/on change>] new settings object:", JSON.parse(changes.uwSettings.newValue));
this.logger.log('error', 'settings',"[Settings] CALLING UPDATE CALLBACK FAILED.") }
} if(changes['uwSettings'] && changes['uwSettings'].newValue) {
} ths.setActive(JSON.parse(changes.uwSettings.newValue));
}); }
if(this.updateCallback) {
try {
updateCallback(ths);
} catch (e) {
this.logger.log('error', 'settings', "[Settings] CALLING UPDATE CALLBACK FAILED.")
}
} }
} }
@ -307,6 +293,23 @@ class Settings {
await this.set(this.active); await this.set(this.active);
} }
async saveWithoutReload() {
if (currentBrowser.firefox) {
browser.storage.onChanged.removeListener(this.storageChangeListener);
} else if (currentBrowser.chrome) {
chrome.storage.onChanged.removeListener(this.storageChangeListener);
}
await this.save();
if(currentBrowser.firefox) {
browser.storage.onChanged.addListener(this.storageChangeListener);
} else if (currentBrowser.chrome) {
chrome.storage.onChanged.addListener(this.storageChangeListener);
}
}
async rollback() { async rollback() {
this.active = await this.get(); this.active = await this.get();
} }