From 8a1b00548490a62ad1d533a5e2648077c4ea9022 Mon Sep 17 00:00:00 2001
From: Mariam Maarouf <mariam@door2door.io>
Date: Thu, 24 Oct 2019 12:35:52 +0200
Subject: [PATCH] Remove from local if is local stored

---
 manifest.json |  2 +-
 popup.js      | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index 8e3eabb..f2f937a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
   "manifest_version": 2,
   "name": "InteractiveFics",
   "author": "mariamrf",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "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 b5292b0..b0a31f2 100644
--- a/popup.js
+++ b/popup.js
@@ -23,6 +23,7 @@ const changeName = () => {
 
 const clearName = () => {
 	chrome.storage.sync.remove('person', chrome.tabs.reload())
+	chrome.storage.local.remove('person', chrome.tabs.reload())
 }
 
 const replaceOther = () => {
@@ -62,11 +63,13 @@ const refreshReplacements = () => {
 const loadSaved = () => {
 	const list = document.getElementById('saved-items-list')
 	list.innerHTML = ''
-	chrome.storage.sync.get(null, loadSavedItems)
-	chrome.storage.local.get(null, loadSavedItems)
+	chrome.storage.sync.get(null, loadSavedItemsWrapper(false))
+	chrome.storage.local.get(null, loadSavedItemsWrapper(true))
 }
 
-const loadSavedItems = (items) => {
+const loadSavedItemsWrapper = isLocal => items => loadSavedItems(items, isLocal)
+
+const loadSavedItems = (items, isLocal) => {
 	const list = document.getElementById('saved-items-list')
 	for (var key in items) {
 		if (key !== DEACTIVATE_KEY && !key.endsWith('_case_sensitive')) {
@@ -74,20 +77,24 @@ const loadSavedItems = (items) => {
 			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')
+			const list_item = createListItem(key, representative, 'one-saved-item', isLocal)
 			list.appendChild(list_item)
 		}
 	}
 }
 
-const createListItem = (id, text, className) => {
+const createListItem = (id, text, className, isLocal) => {
 	const text_node = document.createTextNode(text)
 	const list_node = document.createElement('LI')
 	list_node.appendChild(text_node)
 	list_node.className = className
 	list_node.id = id
 	list_node.addEventListener('click', () => {
-		chrome.storage.sync.remove(id)
+		if (isLocal) {
+			chrome.storage.local.remove(id)
+		} else {
+			chrome.storage.sync.remove(id)
+		}
 		list_node.className += ' strikethrough'
 	})
 	return list_node