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

global config updates

Browse Source
This commit is contained in:
Adam Bradley
2015-06-28 22:33:38 -05:00
parent 95953e4be9
commit fe185c56e7
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ionic/components/app/app.js
View File

@ -36,13 +36,6 @@ export class IonicApp {
return this.components[key];
}
config(val) {
if (arguments.length) {
this._config = val;
}
return this._config;
}
/**
* Create and append the given component into the root
* element of the app.
@ -152,7 +145,7 @@ export function ionicBootstrap(ComponentType, config) {
config.setPlatform(Platform);
// make the config global
IonicConfig.setGlobal(config);
IonicConfig.global = config;
// config and platform settings have been figured out
// apply the correct CSS to the app

6
ionic/config/config.js
View File

@ -1,4 +1,4 @@
import {isString, isObject, isDefined, isFunction, extend} from '../util/util';
import {isObject, isDefined, isFunction, extend} from '../util/util';
export class IonicConfig {
@ -125,7 +125,7 @@ export class IonicConfig {
this._settings.platforms = extend(platform.settings(), this._settings.platforms || {});
}
static setGlobal(config) {
static set global(config) {
globalConfig = config;
}
@ -135,4 +135,4 @@ export class IonicConfig {
}
export let globalConfig = null;
let globalConfig = null;