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

add advanced tabs testg

Browse Source
This commit is contained in:
Andrew
2015-04-02 15:11:00 -06:00
parent 94c10459b8
commit f1bfac8ae7
17 changed files with 300 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/nav-view/nav-view.js
View File

@ -1,5 +1,6 @@
import {DynamicComponent, Parent, NgElement} from 'angular2/angular2'
import {NavViewport} from 'ionic2/components'
import {DynamicComponent, Ancestor, NgElement} from 'angular2/angular2'
import {Optional} from 'angular2/src/di/annotations'
import {NavViewport, Tabs} from 'ionic2/components'
import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader'
import {PrivateComponentLocation} from 'angular2/src/core/compiler/private_component_location'
@ -13,12 +14,15 @@ export class NavView {
constructor(
loader: PrivateComponentLoader,
location: PrivateComponentLocation,
@Parent() viewport: NavViewport,
@NgElement() element: NgElement
@NgElement() element: NgElement,
// FIXME: this is temporary until ng2 lets us inject tabs as a NavViewport
@Optional() @Ancestor() viewportNav: NavViewport,
@Optional() @Ancestor() viewportTabs: Tabs
) {
this.loader = loader
this.location = location
this.viewport = viewport
this.viewport = viewportTabs || viewportNav
this.domElement = element.domElement
}