Add utility method for checking if a value is a standard object

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);
+}