Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 03:01:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: eslint no-restricted-syntax

Browse Source
This commit is contained in:
Peter Jaszkowiak
2021-02-04 01:34:30 -07:00
committed by Julian Lam
parent 115d19e289
commit 5c2f0f0557
19 changed files with 124 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/settings.js
View File

@@ -4,23 +4,16 @@ const meta = require('./meta');
const pubsub = require('./pubsub');
function expandObjBy(obj1, obj2) {
let key;
let val1;
let val2;
let xorValIsArray;
let changed = false;
for (key in obj2) {
if (obj2.hasOwnProperty(key)) {
val2 = obj2[key];
val1 = obj1[key];
xorValIsArray = Array.isArray(val1) === Array.isArray(val2);
if (xorValIsArray || !obj1.hasOwnProperty(key) || typeof val2 !== typeof val1) {
obj1[key] = val2;
for (const [key, val2] of Object.entries(obj2)) {
const val1 = obj1[key];
const xorIsArray = Array.isArray(val1) === Array.isArray(val2);
if (xorIsArray || !obj1.hasOwnProperty(key) || typeof val2 !== typeof val1) {
obj1[key] = val2;
changed = true;
} else if (typeof val2 === 'object' && !Array.isArray(val2)) {
if (expandObjBy(val1, val2)) {
changed = true;
} else if (typeof val2 === 'object' && !Array.isArray(val2)) {
if (expandObjBy(val1, val2)) {
changed = true;
}
}
}
}
@@ -28,16 +21,11 @@ function expandObjBy(obj1, obj2) {
}
function trim(obj1, obj2) {
let key;
let val1;
for (key in obj1) {
if (obj1.hasOwnProperty(key)) {
val1 = obj1[key];
if (!obj2.hasOwnProperty(key)) {
delete obj1[key];
} else if (typeof val1 === 'object' && !Array.isArray(val1)) {
trim(val1, obj2[key]);
}
for (const [key, val1] of Object.entries(obj1)) {
if (!obj2.hasOwnProperty(key)) {
delete obj1[key];
} else if (typeof val1 === 'object' && !Array.isArray(val1)) {
trim(val1, obj2[key]);
}
}
}