open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code cosmetics: inverted "no????" params to straight ones

Browse Source
This commit is contained in:
tophf 2017-04-21 12:33:24 +03:00
parent 9e9723cfd2
commit 468a758cec
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
prefs.js
View File

@ -89,7 +89,7 @@ var prefs = new function Prefs() {
return deepCopy(values); return deepCopy(values);
}, },
set(key, value, {noBroadcast, noSync} = {}) { set(key, value, {broadcast = true, sync = true, fromBroadcast} = {}) {
const oldValue = values[key]; const oldValue = values[key];
switch (typeof defaults[key]) { switch (typeof defaults[key]) {
case typeof value: case typeof value:
@ -107,14 +107,16 @@ var prefs = new function Prefs() {
values[key] = value; values[key] = value;
defineReadonlyProperty(this.readOnlyValues, key, value); defineReadonlyProperty(this.readOnlyValues, key, value);
const hasChanged = !equal(value, oldValue); const hasChanged = !equal(value, oldValue);
if (BG && BG != window) { if (!fromBroadcast) {
BG.prefs.set(key, BG.deepCopy(value), {noBroadcast, noSync}); if (BG && BG != window) {
} else { BG.prefs.set(key, BG.deepCopy(value), {broadcast, sync});
localStorage[key] = typeof defaults[key] == 'object' } else {
? JSON.stringify(value) localStorage[key] = typeof defaults[key] == 'object'
: value; ? JSON.stringify(value)
if (!noBroadcast && hasChanged) { : value;
this.broadcast(key, value, {noSync}); if (broadcast && hasChanged) {
this.broadcast(key, value, {sync});
}
} }
} }
if (hasChanged) { if (hasChanged) {
@ -132,10 +134,10 @@ var prefs = new function Prefs() {
reset: key => this.set(key, deepCopy(defaults[key])), reset: key => this.set(key, deepCopy(defaults[key])),
broadcast(key, value, {noSync} = {}) { broadcast(key, value, {sync = true} = {}) {
broadcastPrefs[key] = value; broadcastPrefs[key] = value;
debounce(doBroadcast); debounce(doBroadcast);
if (!noSync) { if (sync) {
debounce(doSyncSet); debounce(doSyncSet);
} }
}, },
@ -174,18 +176,14 @@ var prefs = new function Prefs() {
} }
if (BG == window) { if (BG == window) {
// when in bg page, .set() will write to localStorage // when in bg page, .set() will write to localStorage
this.set(key, value, {noBroadcast: true, noSync: true}); this.set(key, value, {broadcast: false, sync: false});
} else { } else {
values[key] = value; values[key] = value;
defineReadonlyProperty(this.readOnlyValues, key, value); defineReadonlyProperty(this.readOnlyValues, key, value);
} }
} }
// any access to chrome API takes time due to initialization of bindings if (!BG || BG == window) {
let lazyInit = () => {
window.removeEventListener('load', lazyInit);
lazyInit = null;
getSync().get('settings', ({settings: synced} = {}) => { getSync().get('settings', ({settings: synced} = {}) => {
if (synced) { if (synced) {
for (const key in defaults) { for (const key in defaults) {
@ -195,14 +193,14 @@ var prefs = new function Prefs() {
continue; continue;
} }
if (key in synced) { if (key in synced) {
this.set(key, synced[key], {noSync: true}); this.set(key, synced[key], {sync: false});
} }
} }
} }
if (typeof contextMenus !== 'undefined') { if (typeof contextMenus !== 'undefined') {
for (const id in contextMenus) { for (const id in contextMenus) {
if (typeof values[id] == 'boolean') { if (typeof values[id] == 'boolean') {
this.broadcast(id, values[id], {noSync: true}); this.broadcast(id, values[id], {sync: false});
} }
} }
} }
@ -214,7 +212,7 @@ var prefs = new function Prefs() {
if (synced) { if (synced) {
for (const key in defaults) { for (const key in defaults) {
if (key in synced) { if (key in synced) {
this.set(key, synced[key], {noSync: true}); this.set(key, synced[key], {sync: false});
} }
} }
} else { } else {
@ -223,17 +221,20 @@ var prefs = new function Prefs() {
} }
} }
}); });
}
// any access to chrome API takes time due to initialization of bindings
window.addEventListener('load', function _() {
window.removeEventListener('load', _);
chrome.runtime.onMessage.addListener(msg => { chrome.runtime.onMessage.addListener(msg => {
if (msg.prefs) { if (msg.prefs) {
for (const id in msg.prefs) { for (const id in msg.prefs) {
this.set(id, msg.prefs[id], {noBroadcast: true, noSync: true}); prefs.set(id, msg.prefs[id], {fromBroadcast: true});
} }
} }
}); });
}; });
window.addEventListener('load', lazyInit);
return; return;
function doBroadcast() { function doBroadcast() {