diff --git a/lib/client/config.js b/lib/client/config.js index 682da486..115de4c0 100644 --- a/lib/client/config.js +++ b/lib/client/config.js @@ -58,10 +58,10 @@ var CloudCmd, Util, DOM; function fillTemplate() { CloudCmd.getConfig(function(config) { - var i, n, div, data, li, param, obj = {}; + var i, n, div, data, li, param, obj; - CONFIG = config; - Util.copyObj(CONFIG, obj); + CONFIG = config; + obj = Util.copyObj(CONFIG); changeConfig(obj); data = Util.render(TEMPLATE, obj); div = DOM.anyload({ diff --git a/lib/util.js b/lib/util.js index 5a06abc8..8716c1f8 100644 --- a/lib/util.js +++ b/lib/util.js @@ -217,11 +217,10 @@ * @param pProps */ this.copyObj = function(pFromObj, pToObj, pProps) { - var lRet = pToObj || pProps || {}, - + var toObj = pToObj || pProps || {}, forIn = function(obj) { Util.forIn(obj, function(name) { - pToObj[name] = obj[name]; + toObj[name] = obj[name]; }); }; @@ -232,7 +231,7 @@ forIn(pFromObj); } - return lRet; + return toObj; }; this.convertArrToObj = function(pArrKeys, pArrVal) {