aboutsummaryrefslogtreecommitdiff
path: root/ext/bg/js/options.js
diff options
context:
space:
mode:
authorAlex Yatskov <FooSoft@users.noreply.github.com>2019-09-12 19:47:37 -0700
committerGitHub <noreply@github.com>2019-09-12 19:47:37 -0700
commit1fea1184bd66ed250f8bed8218c08498a7ea81c0 (patch)
tree8374573a36784ce12abb7b490ccd9791aea3f2e3 /ext/bg/js/options.js
parentcc53510883b5c5f75069655df6a6733ff1bd002a (diff)
parent84bd9ff93b15f419ce1076b7545aeb406917f9b5 (diff)
Merge pull request #205 from toasted-nutbread/settings-improvements2
Settings improvements part 2
Diffstat (limited to 'ext/bg/js/options.js')
-rw-r--r--ext/bg/js/options.js15
1 files changed, 10 insertions, 5 deletions
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 69c662e6..d093d0b4 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -330,7 +330,7 @@ function optionsLoad() {
}).then(optionsStr => {
if (typeof optionsStr === 'string') {
const options = JSON.parse(optionsStr);
- if (typeof options === 'object' && options !== null && !Array.isArray(options)) {
+ if (utilIsObject(options)) {
return options;
}
}
@@ -343,9 +343,14 @@ function optionsLoad() {
}
function optionsSave(options) {
- return new Promise((resolve) => {
- chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
- }).then(() => {
- utilBackend().onOptionsUpdated(options);
+ return new Promise((resolve, reject) => {
+ chrome.storage.local.set({options: JSON.stringify(options)}, () => {
+ const error = chrome.runtime.lastError;
+ if (error) {
+ reject(error);
+ } else {
+ resolve();
+ }
+ });
});
}