Harden the Chrome storage API lib.

Clear/delete should clear/delete data that's about to get set.
This commit is contained in:
Mayhem 2014-02-04 15:15:02 +01:00 committed by ccd0
parent c606cc05a0
commit 7f0e719d19

View File

@ -293,29 +293,40 @@ $.localKeys = [
'usercss' 'usercss'
] ]
# https://developer.chrome.com/extensions/storage.html # https://developer.chrome.com/extensions/storage.html
$.delete = (keys) -> do ->
items =
local: {}
sync: {}
$.delete = (keys) ->
if typeof keys is 'string'
keys = [keys]
for key in keys
delete items.local[key]
delete items.sync[key]
chrome.storage.sync.remove keys chrome.storage.sync.remove keys
$.get = (key, val, cb) ->
$.get = (key, val, cb) ->
if typeof cb is 'function' if typeof cb is 'function'
items = $.item key, val data = $.item key, val
else else
items = key data = key
cb = val cb = val
localItems = null localItems = null
syncItems = null syncItems = null
for key, val of items for key, val of data
if key in $.localKeys if key in $.localKeys
(localItems or= {})[key] = val (localItems or= {})[key] = val
else else
(syncItems or= {})[key] = val (syncItems or= {})[key] = val
count = 0 count = 0
done = (item) -> done = (result) ->
if chrome.runtime.lastError if chrome.runtime.lastError
c.error chrome.runtime.lastError.message c.error chrome.runtime.lastError.message
$.extend items, item $.extend data, result
cb items unless --count cb data unless --count
if localItems if localItems
count++ count++
@ -323,12 +334,8 @@ $.get = (key, val, cb) ->
if syncItems if syncItems
count++ count++
chrome.storage.sync.get syncItems, done chrome.storage.sync.get syncItems, done
$.set = do ->
items =
sync: {}
local: {}
timeout = {}
timeout = {}
setArea = (area) -> setArea = (area) ->
data = items[area] data = items[area]
return if !Object.keys(data).length or timeout[area] return if !Object.keys(data).length or timeout[area]
@ -342,11 +349,11 @@ $.set = do ->
delete timeout[area] delete timeout[area]
items[area] = {} items[area] = {}
setAll = $.debounce 5 * $.SECOND, -> setAll = $.debounce $.SECOND, ->
setArea 'local' setArea 'local'
setArea 'sync' setArea 'sync'
(key, val) -> $.set = (key, val) ->
if typeof key is 'string' if typeof key is 'string'
items.sync[key] = val items.sync[key] = val
else else
@ -355,7 +362,10 @@ $.set = do ->
items.local[key] = items.sync[key] items.local[key] = items.sync[key]
delete items.sync[key] delete items.sync[key]
setAll() setAll()
$.clear = (cb) ->
$.clear = (cb) ->
items.local = {}
items.sync = {}
count = 2 count = 2
done = -> done = ->
if chrome.runtime.lastError if chrome.runtime.lastError