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

added number-type to settings framework. persist expanded object on server-side sync if changed

Browse Source
This commit is contained in:
FrissDieGurke
2014-05-10 19:49:50 +02:00
parent 8ee866fc9d
commit ab2c0cfa9f
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/settings.js
View File

@@ -1,16 +1,20 @@
var meta = require('./meta');
function expandObjBy(obj1, obj2) {
var key, val1, val2;
var key, val1, val2, changed = false;
for (key in obj2) {
val2 = obj2[key];
val1 = obj1[key];
if (!obj1.hasOwnProperty(key) || typeof val2 !== typeof val1) {
obj1[key] = val2;
changed = true;
} else if (typeof val2 === 'object') {
expandObjBy(val1, val2);
if (expandObjBy(val1, val2)) {
changed = true;
}
}
}
return changed;
}
function trim(obj1, obj2) {
@@ -76,7 +80,9 @@ Settings.prototype.sync = function (callback) {
}
} catch (_error) {}
_this.cfg = settings;
if (typeof callback === 'function') {
if (expandObjBy(_this.cfg._, _this.defCfg)) {
_this.persist(callback);
} else if (typeof callback === 'function') {
callback.apply(_this, err);
}
});