From 7fe653eae396d37e1948fe8b9be8a99cdd7e5ef2 Mon Sep 17 00:00:00 2001 From: Mariam Maarouf Date: Sun, 20 Oct 2019 13:41:12 +0200 Subject: [PATCH] Make sync update backwards compatible --- content_script.js | 23 +++++++++++++---------- manifest.json | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/content_script.js b/content_script.js index 44dc8f7..dc89a2b 100644 --- a/content_script.js +++ b/content_script.js @@ -9,18 +9,21 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => { }); const replaceAll = () => { - chrome.storage.sync.get(null, items => { - if (!items[DEACTIVATE_KEY]) { - for (var key in items) { - if (key == 'person') { - const regexp_y_n = /\by\/n\b|\(y\/n\)|\[y\/n\]/ig - replace(regexp_y_n, items[key]) - } else if (key !== DEACTIVATE_KEY && !key.endsWith('_case_sensitive')) { - escapeAndReplace(key, items[key], items[`${key}_case_sensitive`]) - } + chrome.storage.sync.get(null, replaceAllInStorage) + chrome.storage.local.get(null, replaceAllInStorage) +} + +const replaceAllInStorage = (items) => { + if (!items[DEACTIVATE_KEY]) { + for (var key in items) { + if (key == 'person') { + const regexp_y_n = /\by\/n\b|\(y\/n\)|\[y\/n\]/ig + replace(regexp_y_n, items[key]) + } else if (key !== DEACTIVATE_KEY && !key.endsWith('_case_sensitive')) { + escapeAndReplace(key, items[key], items[`${key}_case_sensitive`]) } } - }) + } } const escapeAndReplace = (input_word, replace_value, case_sensitive) => { diff --git a/manifest.json b/manifest.json index 7ea4ef3..cdca523 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "manifest_version": 2, "name": "InteractiveFics", "author": "mariamrf", - "version": "5.0.1", + "version": "5.0.2", "description": "Replaces Y/N & other variables in Reader Insert/second person fics with words of your choice.", "browser_action": { "default_title": "InteractiveFics",