Remove from local if is local stored

This commit is contained in:
Mariam Maarouf 2019-10-24 12:35:52 +02:00
parent 11e37d3759
commit 8a1b005484
2 changed files with 14 additions and 7 deletions

View File

@ -3,7 +3,7 @@
"manifest_version": 2, "manifest_version": 2,
"name": "InteractiveFics", "name": "InteractiveFics",
"author": "mariamrf", "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.", "description": "Replaces Y/N & other variables in Reader Insert/second person fics with words of your choice.",
"browser_action": { "browser_action": {
"default_title": "InteractiveFics", "default_title": "InteractiveFics",

View File

@ -23,6 +23,7 @@ const changeName = () => {
const clearName = () => { const clearName = () => {
chrome.storage.sync.remove('person', chrome.tabs.reload()) chrome.storage.sync.remove('person', chrome.tabs.reload())
chrome.storage.local.remove('person', chrome.tabs.reload())
} }
const replaceOther = () => { const replaceOther = () => {
@ -62,11 +63,13 @@ const refreshReplacements = () => {
const loadSaved = () => { const loadSaved = () => {
const list = document.getElementById('saved-items-list') const list = document.getElementById('saved-items-list')
list.innerHTML = '' list.innerHTML = ''
chrome.storage.sync.get(null, loadSavedItems) chrome.storage.sync.get(null, loadSavedItemsWrapper(false))
chrome.storage.local.get(null, loadSavedItems) 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') const list = document.getElementById('saved-items-list')
for (var key in items) { for (var key in items) {
if (key !== DEACTIVATE_KEY && !key.endsWith('_case_sensitive')) { 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 = !!items[`${key}_case_sensitive`]
const case_sensitive_string = case_sensitive ? 'case sensitive' : 'not case sensitive' const case_sensitive_string = case_sensitive ? 'case sensitive' : 'not case sensitive'
const representative = `${label} -> ${items[key]} (${case_sensitive_string})` 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) list.appendChild(list_item)
} }
} }
} }
const createListItem = (id, text, className) => { const createListItem = (id, text, className, isLocal) => {
const text_node = document.createTextNode(text) const text_node = document.createTextNode(text)
const list_node = document.createElement('LI') const list_node = document.createElement('LI')
list_node.appendChild(text_node) list_node.appendChild(text_node)
list_node.className = className list_node.className = className
list_node.id = id list_node.id = id
list_node.addEventListener('click', () => { 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' list_node.className += ' strikethrough'
}) })
return list_node return list_node