javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-08 07:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(all): allow external imports

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-04-24 15:10:15 +02:00
parent 0c1476e0ff
commit 053c375521
160 changed files with 3451 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/global/ionic-global.ts
View File

@ -1,6 +1,7 @@
import 'ionicons';
import { Config, configFromURL } from '../utils/config';
import { Config } from './config';
import { isIOS } from '../utils/platform';
import { configFromURL } from '../utils/config';
const Ionic = (window as any).Ionic = (window as any).Ionic || {};
declare const Context: any;
@ -14,8 +15,8 @@ Object.defineProperty(Ionic, 'queue', {
// create the Ionic.config from raw config object (if it exists)
// and convert Ionic.config into a ConfigApi that has a get() fn
const config = Ionic.config = Context.config = new Config({
...configFromURL(window),
...Ionic.config,
...configFromURL()
});
// first see if the mode was set as an attribute on <html>