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

linting settings.js

Browse Source
This commit is contained in:
psychobunny
2014-05-12 12:59:34 -04:00
parent a121ec716a
commit 3c7b433e3a
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings.js
View File

@@ -1,8 +1,11 @@
"use strict";
var meta = require('./meta'); var meta = require('./meta');
function expandObjBy(obj1, obj2) { function expandObjBy(obj1, obj2) {
var key, val1, val2, changed = false; var key, val1, val2, changed = false;
for (key in obj2) { for (key in obj2) {
if (obj2.hasOwnProperty(key)) {
val2 = obj2[key]; val2 = obj2[key];
val1 = obj1[key]; val1 = obj1[key];
if (!obj1.hasOwnProperty(key) || typeof val2 !== typeof val1) { if (!obj1.hasOwnProperty(key) || typeof val2 !== typeof val1) {
@@ -12,12 +15,14 @@ function expandObjBy(obj1, obj2) {
changed = true; changed = true;
} }
} }
}
return changed; return changed;
} }
function trim(obj1, obj2) { function trim(obj1, obj2) {
var key, val1; var key, val1;
for (key in obj1) { for (key in obj1) {
if (obj1.hasOwnProperty(key)) {
val1 = obj1[key]; val1 = obj1[key];
if (!obj2.hasOwnProperty(key)) { if (!obj2.hasOwnProperty(key)) {
delete obj1[key]; delete obj1[key];
@@ -26,6 +31,7 @@ function trim(obj1, obj2) {
} }
} }
} }
}
function mergeSettings(cfg, defCfg) { function mergeSettings(cfg, defCfg) {
if (typeof defCfg !== 'object') { if (typeof defCfg !== 'object') {