@@ -12,41 +12,23 @@ import {ViewController} from '../nav/view-controller';
12
12
selector : 'ion-header'
13
13
} )
14
14
export class Header {
15
- private _h : number = 0 ;
16
15
17
- constructor ( viewCtr : ViewController , private _elementRef : ElementRef ) {
18
- viewCtr . setHeader ( this ) ;
16
+ constructor ( @ Optional ( ) viewCtr : ViewController ) {
17
+ viewCtr && viewCtr . setHeader ( this ) ;
19
18
}
20
19
21
- setHeight ( heightPixels : number ) {
22
- this . _h = heightPixels ;
23
- this . _elementRef . nativeElement . style . height = ( heightPixels > 0 ? heightPixels + 'px' : '' ) ;
24
- }
25
-
26
- getHeight ( ) : number {
27
- return this . _h ;
28
- }
29
20
}
30
21
31
22
32
23
@Directive ( {
33
24
selector : 'ion-footer'
34
25
} )
35
26
export class Footer {
36
- private _h : number = 0 ;
37
27
38
- constructor ( viewCtr : ViewController , private _elementRef : ElementRef ) {
39
- viewCtr . setFooter ( this ) ;
28
+ constructor ( @ Optional ( ) viewCtr : ViewController ) {
29
+ viewCtr && viewCtr . setFooter ( this ) ;
40
30
}
41
31
42
- setHeight ( heightPixels : number ) {
43
- this . _h = heightPixels ;
44
- this . _elementRef . nativeElement . style . height = ( heightPixels > 0 ? heightPixels + 'px' : '' ) ;
45
- }
46
-
47
- getHeight ( ) : number {
48
- return this . _h ;
49
- }
50
32
}
51
33
52
34
@@ -109,7 +91,7 @@ export class ToolbarBase extends Ion {
109
91
* A Toolbar is a generic bar that is positioned above or below content.
110
92
* Unlike a [Navbar](../../nav/Navbar), a toolbar can be used as a subheader.
111
93
* When toolbars are placed within an `<ion-header>` or `<ion-footer>`,
112
- * they stay fixed in their respective location. When placed within
94
+ * the toolbars stay fixed in their respective location. When placed within
113
95
* `<ion-content>`, toolbars will scroll with the content.
114
96
*
115
97
*
0 commit comments