mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #5974 from electron/chrome-storage-sync

Browse source 
Add chrome.storage.sync and chrome.storage.get APIs
This commit is contained in:
Jessica Lord 2016-06-10 12:20:03 -07:00 • committed by GitHub
commit c68ca16148
5 changed files with 77 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
filenames.gypi
View file

@ -64,6 +64,7 @@
'lib/renderer/api/screen.js', 'lib/renderer/api/screen.js',
'lib/renderer/api/web-frame.js', 'lib/renderer/api/web-frame.js',
'lib/renderer/extensions/i18n.js', 'lib/renderer/extensions/i18n.js',
'lib/renderer/extensions/storage.js',
], ],
'js2c_sources': [ 'js2c_sources': [
'lib/common/asar.js', 'lib/common/asar.js',

7
lib/renderer/chrome-api.js
View file

@ -183,12 +183,7 @@ exports.injectTo = function (extensionId, isBackgroundPage, context) {
onMessage: chrome.runtime.onMessage onMessage: chrome.runtime.onMessage
} }
chrome.storage = { chrome.storage = require('./extensions/storage.js')
sync: {
get () {},
set () {}
}
}
chrome.pageAction = { chrome.pageAction = {
show () {}, show () {},

59
lib/renderer/extensions/storage.js Normal file
View file

@ -0,0 +1,59 @@
const getStorage = () => {
const data = window.localStorage.getItem('__chrome.storage.sync__')
if (data != null) {
return JSON.parse(data)
} else {
return {}
}
}
const setStorage = (storage) => {
const json = JSON.stringify(storage)
window.localStorage.setItem('__chrome.storage.sync__', json)
}
module.exports = {
sync: {
get (keys, callback) {
const storage = getStorage()
if (keys == null) return storage
let defaults = {}
switch (typeof keys) {
case 'string':
keys = [keys]
break
case 'object':
if (!Array.isArray(keys)) {
defaults = keys
keys = Object.keys(keys)
}
break
}
if (keys.length === 0) return {}
let items = {}
keys.forEach(function (key) {
var value = storage[key]
if (value == null) value = defaults[key]
items[key] = value
})
setTimeout(function () {
callback(items)
})
},
set (items, callback) {
const storage = getStorage()
Object.keys(items).forEach(function (name) {
storage[name] = items[name]
})
setStorage(storage)
setTimeout(callback)
}
}
}

1
spec/api-browser-window-spec.js
View file

@ -878,6 +878,7 @@ describe('browser-window module', function () {
assert.equal(message.runtimeId, 'foo') assert.equal(message.runtimeId, 'foo')
assert.equal(message.tabId, w.webContents.id) assert.equal(message.tabId, w.webContents.id)
assert.equal(message.i18nString, 'foo - bar (baz)') assert.equal(message.i18nString, 'foo - bar (baz)')
assert.deepEqual(message.storageItems, {foo: 'bar'})
done() done()
}) })
}) })

21
spec/fixtures/devtools-extensions/foo/index.html vendored
View file

@ -4,13 +4,22 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title></title> <title></title>
<script> <script>
var message = JSON.stringify({ function testStorage (callback) {
runtimeId: chrome.runtime.id, chrome.storage.sync.set({foo: 'bar'}, function () {
tabId: chrome.devtools.inspectedWindow.tabId, chrome.storage.sync.get({foo: 'baz'}, callback)
i18nString: chrome.i18n.getMessage('foo', ['bar', 'baz']) })
}
testStorage(function (items) {
var message = JSON.stringify({
runtimeId: chrome.runtime.id,
tabId: chrome.devtools.inspectedWindow.tabId,
i18nString: chrome.i18n.getMessage('foo', ['bar', 'baz']),
storageItems: items
})
var sendMessage = `require('electron').ipcRenderer.send('answer', ${message})`
window.chrome.devtools.inspectedWindow.eval(sendMessage, function () {})
}) })
var sendMessage = `require('electron').ipcRenderer.send('answer', ${message})`
window.chrome.devtools.inspectedWindow.eval(sendMessage, function () {})
</script> </script>
</head> </head>
<body> <body>