javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

hairlines body css polyfill

Browse Source
This commit is contained in:
Adam Bradley
2015-07-24 14:46:26 -05:00
parent 526f43cd96
commit c8d03793a3
5 changed files with 42 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ionic/components/nav-bar/nav-bar.ts
View File

@@ -1,4 +1,4 @@
import {Directive, View, Parent, ElementRef, forwardRef} from 'angular2/angular2';
import {Directive, View, Parent, Optional, ElementRef, forwardRef} from 'angular2/angular2';
import {ProtoViewRef} from 'angular2/src/core/compiler/view_ref';
import {ToolbarBase} from '../toolbar/toolbar';
@@ -45,11 +45,16 @@ import {ViewItem} from '../view/view-item';
]
})
export class Navbar extends ToolbarBase {
constructor(item: ViewItem, elementRef: ElementRef, config: IonicConfig, app: IonicApp) {
constructor(
elementRef: ElementRef,
config: IonicConfig,
app: IonicApp,
@Optional() item: ViewItem
) {
super(elementRef, config);
this.app = app;
item.navbarView(this);
item && item.navbarView(this);
this.bbClass = config.setting('backButtonIcon');
this.bbDefault = config.setting('backButtonText');
@@ -83,7 +88,7 @@ export class Navbar extends ToolbarBase {
}
})
class BackButton {
constructor(@Parent() navbar: Navbar, item: ViewItem, elementRef: ElementRef) {
constructor(@Parent() navbar: Navbar, @Optional() item: ViewItem, elementRef: ElementRef) {
this.item = item;
navbar.backButtonElement(elementRef);
}
@@ -91,7 +96,7 @@ class BackButton {
goBack(ev) {
ev.stopPropagation();
ev.preventDefault();
this.item.viewCtrl.pop();
this.item && this.item.viewCtrl.pop();
}
}
@@ -132,7 +137,7 @@ class NavbarItem {
selector: 'template[navbar]'
})
export class NavbarTemplate {
constructor(item: ViewItem, protoViewRef: ProtoViewRef) {
item.addProtoViewRef('navbar', protoViewRef);
constructor(@Optional() item: ViewItem, protoViewRef: ProtoViewRef) {
item && item.addProtoViewRef('navbar', protoViewRef);
}
}