javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(config)

Browse Source
This commit is contained in:
Adam Bradley
2015-10-05 15:20:47 -05:00
parent 194f3e4aad
commit a53efcdeb4
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ionic/config/config.ts
View File

@ -38,8 +38,9 @@ export class IonicConfig {
this._s.platforms[args[0]] = args[1]; this._s.platforms[args[0]] = args[1];
this._c = {}; // clear cache this._c = {}; // clear cache
break; break;
} }
return this;
} }
/** /**
@ -85,7 +86,6 @@ export class IonicConfig {
// if there was no user config then it'll check each of // if there was no user config then it'll check each of
// the user config's platforms, which already contains // the user config's platforms, which already contains
// settings from default platform configs // settings from default platform configs
this._c[key] = null;
let userPlatformValue = undefined; let userPlatformValue = undefined;
let userDefaultValue = this._s[key]; let userDefaultValue = this._s[key];
@ -104,11 +104,11 @@ export class IonicConfig {
let activePlatformKeys = this._platform.platforms(); let activePlatformKeys = this._platform.platforms();
// loop through all of the active platforms we're on // loop through all of the active platforms we're on
for (let i = 0; i < activePlatformKeys.length; i++) { for (let i = 0, l = activePlatformKeys.length; i < l; i++) {
// get user defined platform values // get user defined platform values
if (this._s.platforms) { if (this._s.platforms) {
configObj = this._s.platforms[ activePlatformKeys[i] ]; configObj = this._s.platforms[activePlatformKeys[i]];
if (configObj) { if (configObj) {
if (isDefined(configObj[key])) { if (isDefined(configObj[key])) {
userPlatformValue = configObj[key]; userPlatformValue = configObj[key];
@ -139,13 +139,11 @@ export class IonicConfig {
} }
if (this._s.mode) { }
configObj = IonicConfig.getModeConfig(this._s.mode);
if (configObj && isDefined(configObj[key])) {
userDefaultModeValue = configObj[key];
}
}
configObj = IonicConfig.getModeConfig(this._s.mode);
if (configObj && isDefined(configObj[key])) {
userDefaultModeValue = configObj[key];
} }
// cache the value // cache the value