alex/yomichan
1
Fork 0
Code Releases Activity

utilIsObject => isObject, move to core.js

Browse Source
This commit is contained in:
toasted-nutbread 2019-11-26 17:33:09 -05:00
parent 7e94fca7c7
commit 099847729c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/bg/js/options.js
View File

@ -389,7 +389,7 @@ function optionsUpdateVersion(options, defaultProfileOptions) {
// Remove invalid // Remove invalid
const profiles = options.profiles; const profiles = options.profiles;
for (let i = profiles.length - 1; i >= 0; --i) { for (let i = profiles.length - 1; i >= 0; --i) {
if (!utilIsObject(profiles[i])) { if (!isObject(profiles[i])) {
profiles.splice(i, 1); profiles.splice(i, 1);
} }
} }
@ -440,7 +440,7 @@ function optionsLoad() {
}).then(optionsStr => { }).then(optionsStr => {
if (typeof optionsStr === 'string') { if (typeof optionsStr === 'string') {
const options = JSON.parse(optionsStr); const options = JSON.parse(optionsStr);
if (utilIsObject(options)) { if (isObject(options)) {
return options; return options;
} }
} }

4
ext/bg/js/util.js
View File

@ -111,7 +111,3 @@ function utilReadFile(file) {
reader.readAsBinaryString(file); reader.readAsBinaryString(file);
}); });
} }
function utilIsObject(value) {
return typeof value === 'object' && value !== null && !Array.isArray(value);
}

4
ext/mixed/js/core.js
View File

@ -148,3 +148,7 @@ function stringReplaceAsync(str, regex, replacer) {
parts.push(str.substring(index)); parts.push(str.substring(index));
return Promise.all(parts).then(v => v.join('')); return Promise.all(parts).then(v => v.join(''));
} }
function isObject(value) {
return typeof value === 'object' && value !== null && !Array.isArray(value);
}