From 11e37d3759aec8a3b516c65faf1da36c5bae8da6 Mon Sep 17 00:00:00 2001
From: Mariam Maarouf <mariam@door2door.io>
Date: Mon, 21 Oct 2019 00:07:17 +0200
Subject: [PATCH] Display retrieved replacements
---
manifest.json | 2 +-
popup.js | 35 +++++++++++++++++------------------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/manifest.json b/manifest.json
index cdca523..8e3eabb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
"manifest_version": 2,
"name": "InteractiveFics",
"author": "mariamrf",
- "version": "5.0.2",
+ "version": "5.0.3",
"description": "Replaces Y/N & other variables in Reader Insert/second person fics with words of your choice.",
"browser_action": {
"default_title": "InteractiveFics",
diff --git a/popup.js b/popup.js
index de9a1cd..b5292b0 100644
--- a/popup.js
+++ b/popup.js
@@ -60,25 +60,24 @@ const refreshReplacements = () => {
}
const loadSaved = () => {
- chrome.storage.sync.get(null, items => {
- const list = document.getElementById('saved-items-list')
- list.innerHTML = ''
- let hasItems = false
- for (var key in items) {
- if (key !== DEACTIVATE_KEY && !key.endsWith('_case_sensitive')) {
- const label = key === 'person' ? 'Y/N' : key
- const case_sensitive = !!items[`${key}_case_sensitive`]
- const case_sensitive_string = case_sensitive ? 'case sensitive' : 'not case sensitive'
- const representative = `${label} -> ${items[key]} (${case_sensitive_string})`
- const list_item = createListItem(key, representative, 'one-saved-item')
- list.appendChild(list_item)
- hasItems = true
- }
+ const list = document.getElementById('saved-items-list')
+ list.innerHTML = ''
+ chrome.storage.sync.get(null, loadSavedItems)
+ chrome.storage.local.get(null, loadSavedItems)
+}
+
+const loadSavedItems = (items) => {
+ const list = document.getElementById('saved-items-list')
+ for (var key in items) {
+ if (key !== DEACTIVATE_KEY && !key.endsWith('_case_sensitive')) {
+ const label = key === 'person' ? 'Y/N' : key
+ const case_sensitive = !!items[`${key}_case_sensitive`]
+ const case_sensitive_string = case_sensitive ? 'case sensitive' : 'not case sensitive'
+ const representative = `${label} -> ${items[key]} (${case_sensitive_string})`
+ const list_item = createListItem(key, representative, 'one-saved-item')
+ list.appendChild(list_item)
}
- if (!hasItems) {
- list.innerHTML = '<small>No stored replacements yet!</small>'
- }
- })
+ }
}
const createListItem = (id, text, className) => {