aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2019-09-07 17:35:33 -0400
committertoasted-nutbread <toasted-nutbread@users.noreply.github.com>2019-09-10 20:09:33 -0400
commitc4e6d7e3d18bc87a9e682349bd96fc35d7815bbc (patch)
treec5fd842e9bb41e240c0790059bf68326e3e980f6
parent05ce350792fd60c1721bff4d0fb971e2bec24818 (diff)
Add utility method for checking if a value is a standard object
-rw-r--r--ext/bg/js/options.js2
-rw-r--r--ext/bg/js/util.js4
2 files changed, 5 insertions, 1 deletions
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index ea8f56d5..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;
}
}
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 3dc7c900..79229229 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -104,3 +104,7 @@ function utilReadFile(file) {
reader.readAsBinaryString(file);
});
}
+
+function utilIsObject(value) {
+ return typeof value === 'object' && value !== null && !Array.isArray(value);
+}