javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-24 23:01:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(di): update dependency injection and default configs

Browse Source
This commit is contained in:
Adam Bradley
2016-09-16 00:49:09 -05:00
parent 1d403b26ed
commit 7c05d0c0ba
34 changed files with 1396 additions and 1534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/app/app-root.ts
View File

@ -2,12 +2,11 @@ import { Component, ComponentFactoryResolver, ElementRef, Inject, OnInit, Opaque
import { App } from './app';
import { Config } from '../../config/config';
import { FeatureDetect } from '../../util/feature-detect';
import { Ion } from '../ion';
import { OverlayPortal } from '../nav/overlay-portal';
import { Platform } from '../../platform/platform';
export const UserRoot = new OpaqueToken('USERROOT');
export const AppRootToken = new OpaqueToken('USERROOT');
/**
* @private
@ -32,13 +31,12 @@ export class IonicApp extends Ion implements OnInit {
@ViewChild('toastPortal', { read: OverlayPortal }) _toastPortal: OverlayPortal;
constructor(
@Inject(UserRoot) private _userCmp: any,
@Inject(AppRootToken) private _userCmp: any,
private _cfr: ComponentFactoryResolver,
elementRef: ElementRef,
renderer: Renderer,
config: Config,
private _platform: Platform,
private _featureDetect: FeatureDetect,
app: App
) {
super(config, elementRef, renderer);
@ -80,8 +78,6 @@ export class IonicApp extends Ion implements OnInit {
if (this._config.getBoolean('hoverCSS', true)) {
this.setElementClass('enable-hover', true);
}
this._featureDetect.test(this);
}
/**