From ce87b707a8b428eb5bd363508ab33e0bfd14cea2 Mon Sep 17 00:00:00 2001 From: koops76 Date: Fri, 11 Aug 2017 02:44:07 +0300 Subject: [PATCH 1/3] Update background.js --- chromium/background.js | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/chromium/background.js b/chromium/background.js index 648da2cd6fde..8df8305d41c7 100644 --- a/chromium/background.js +++ b/chromium/background.js @@ -679,36 +679,35 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse){ // Send a message to the embedded webextension bootstrap.js to get settings to import chrome.runtime.sendMessage("import-legacy-data", import_settings); +function setStorage(values) { + return new Promise(resolve => { + storage.set(values, resolve); + } +} + /** * Import extension settings (custom rulesets, ruleset toggles, globals) from an object * @param settings the settings object */ -async function import_settings(settings){ - if(settings.changed){ - // Load custom rulesets and add to storage - await new Promise(resolve => { - storage.set({"legacy_custom_rulesets": settings.custom_rulesets}, resolve); - }); - +async function import_settings(settings) { + if (settings.changed) { // Load all the ruleset toggles into memory and store - let rule_toggle_promises = []; - for(let ruleset_name in settings.rule_toggle){ + for (const ruleset_name in settings.rule_toggle) { localStorage[ruleset_name] = settings.rule_toggle[ruleset_name]; } all_rules = new RuleSets(localStorage); all_rules.addFromXml(loadExtensionFile('rules/default.rulesets', 'xml')); + + // Load custom rulesets load_legacy_custom_rulesets(settings.custom_rulesets); - // Set/store globals - await new Promise(resolve => { - storage.set({'httpNowhere': settings.prefs.http_nowhere_enabled}, resolve); - }); - await new Promise(resolve => { - storage.set({'showCounter': settings.prefs.show_counter}, resolve); - }); - await new Promise(resolve => { - storage.set({'globalEnabled': settings.prefs.global_enabled}, resolve); + // Save settings + await setStorage({ + legacy_custom_rulesets: settings.custom_rulesets, + httpNowhere: settings.prefs.http_nowhere_enabled, + showCounter: settings.prefs.show_counter, + globalEnabled: settings.prefs.global_enabled }); } } From 093fb8b09c622e827fd4dab88da7228666dfa8e9 Mon Sep 17 00:00:00 2001 From: koops76 Date: Fri, 11 Aug 2017 06:01:07 +0300 Subject: [PATCH 2/3] Update background.js --- chromium/background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/background.js b/chromium/background.js index 8df8305d41c7..eac54c86fea1 100644 --- a/chromium/background.js +++ b/chromium/background.js @@ -682,7 +682,7 @@ chrome.runtime.sendMessage("import-legacy-data", import_settings); function setStorage(values) { return new Promise(resolve => { storage.set(values, resolve); - } + }) } /** From e9a7db3a6a4ee3f11c15813ad937bca9f289865a Mon Sep 17 00:00:00 2001 From: koops76 Date: Fri, 11 Aug 2017 06:44:22 +0300 Subject: [PATCH 3/3] Update background.js --- chromium/background.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/chromium/background.js b/chromium/background.js index eac54c86fea1..4553669cdc12 100644 --- a/chromium/background.js +++ b/chromium/background.js @@ -679,12 +679,6 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse){ // Send a message to the embedded webextension bootstrap.js to get settings to import chrome.runtime.sendMessage("import-legacy-data", import_settings); -function setStorage(values) { - return new Promise(resolve => { - storage.set(values, resolve); - }) -} - /** * Import extension settings (custom rulesets, ruleset toggles, globals) from an object * @param settings the settings object @@ -703,11 +697,13 @@ async function import_settings(settings) { load_legacy_custom_rulesets(settings.custom_rulesets); // Save settings - await setStorage({ - legacy_custom_rulesets: settings.custom_rulesets, - httpNowhere: settings.prefs.http_nowhere_enabled, - showCounter: settings.prefs.show_counter, - globalEnabled: settings.prefs.global_enabled + await new Promise(resolve => { + storage.set({ + legacy_custom_rulesets: settings.custom_rulesets, + httpNowhere: settings.prefs.http_nowhere_enabled, + showCounter: settings.prefs.show_counter, + globalEnabled: settings.prefs.global_enabled + }, resolve); }); } }