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

refactor(structure): allow content to scroll under headers/footers

Browse Source
This commit is contained in:
Adam Bradley
2016-06-16 11:28:02 -05:00
parent 64af0c8ba0
commit d13fa4e2cf
57 changed files with 1390 additions and 956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/navbar/navbar.ts
View File

@ -1,4 +1,4 @@
import {Component, Directive, Optional, ElementRef, Renderer, TemplateRef, forwardRef, Inject, ViewContainerRef, Input} from '@angular/core';
import {Component, Directive, Optional, ElementRef, Renderer, forwardRef, Inject, Input} from '@angular/core';
import {Ion} from '../ion';
import {Icon} from '../icon/icon';
@ -137,8 +137,7 @@ export class Navbar extends ToolbarBase {
private _app: App,
@Optional() viewCtrl: ViewController,
elementRef: ElementRef,
config: Config,
private _renderer: Renderer
config: Config
) {
super(elementRef);
@ -230,14 +229,13 @@ export class Navbar extends ToolbarBase {
selector: 'template[navbar]'
})
export class NavbarTemplate {
constructor(
viewContainerRef: ViewContainerRef,
templateRef: TemplateRef<Object>,
@Optional() viewCtrl: ViewController
) {
if (viewCtrl) {
viewCtrl.setNavbarTemplateRef(templateRef);
viewCtrl.setNavbarViewRef(viewContainerRef);
}
constructor() {
// deprecated warning: added 2016-06-14, beta.10
console.warn('ion-navbar no longer requires *navbar attribute. Please restructure header to:\n' +
'<ion-header>\n' +
' <ion-navbar>\n' +
' ...\n' +
' </ion-navbar>\n' +
'</ion-header>');
}
}