|
@@ -18,9 +18,9 @@ var ConfigUtil = {
|
18
|
18
|
* }
|
19
|
19
|
*/
|
20
|
20
|
overrideConfigJSON: function (config, interfaceConfig, newConfig) {
|
21
|
|
- for (var configRoot in newConfig) {
|
22
|
|
-
|
23
|
|
- var confObj = null;
|
|
21
|
+ var configRoot, key, value, confObj;
|
|
22
|
+ for (configRoot in newConfig) {
|
|
23
|
+ confObj = null;
|
24
|
24
|
if (configRoot == "config") {
|
25
|
25
|
confObj = config;
|
26
|
26
|
} else if (configRoot == "interfaceConfig") {
|
|
@@ -29,15 +29,11 @@ var ConfigUtil = {
|
29
|
29
|
continue;
|
30
|
30
|
}
|
31
|
31
|
|
32
|
|
- for (var key in newConfig[configRoot]) {
|
33
|
|
- var value = newConfig[configRoot][key];
|
34
|
|
- if (confObj[key] && typeof confObj[key] !== typeof value)
|
35
|
|
- {
|
36
|
|
- console.warn(
|
37
|
|
- "The type of " + key +
|
38
|
|
- " is wrong. That parameter won't be updated in: ",
|
39
|
|
- confObj);
|
40
|
|
- continue;
|
|
32
|
+ for (key in newConfig[configRoot]) {
|
|
33
|
+ value = newConfig[configRoot][key];
|
|
34
|
+ if (confObj[key] && typeof confObj[key] !== typeof value) {
|
|
35
|
+ console.log("Overriding a " + configRoot +
|
|
36
|
+ " property with a property of different type.");
|
41
|
37
|
}
|
42
|
38
|
console.info("Overriding " + key + " with: " + value);
|
43
|
39
|
confObj[key] = value;
|