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

fix(components): add a mode agnostic css class (#9133)

Browse Source 
Fixes #8545
This commit is contained in:
Alan
2016-11-14 13:50:01 -05:00
committed by Brandy Carney
parent d3ef28d3ec
commit 025c5cc646
30 changed files with 148 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/toolbar/toolbar-item.ts
View File

@@ -23,9 +23,7 @@ export class ToolbarItem extends Ion {
@Optional() toolbar: Toolbar,
@Optional() @Inject(forwardRef(() => Navbar)) navbar: Navbar
) {
super(config, elementRef, renderer);
this._setMode('bar-buttons', config.get('mode'));
super(config, elementRef, renderer, 'bar-buttons');
this.inToolbar = !!(toolbar || navbar);
}

3
src/components/toolbar/toolbar-title.ts
View File

@@ -58,8 +58,7 @@ export class ToolbarTitle extends Ion {
@Optional() toolbar: Toolbar,
@Optional() @Inject(forwardRef(() => Navbar)) navbar: Navbar
) {
super(config, elementRef, renderer);
this._setMode('title', this._mode = config.get('mode'));
super(config, elementRef, renderer, 'title');
toolbar && toolbar._setTitle(this);
navbar && navbar._setTitle(this);

14
src/components/toolbar/toolbar.ts
View File

@@ -39,8 +39,7 @@ import { ViewController } from '../../navigation/view-controller';
export class Header extends Ion {
constructor(config: Config, elementRef: ElementRef, renderer: Renderer, @Optional() viewCtrl: ViewController) {
super(config, elementRef, renderer);
this._setMode('header', config.get('mode'));
super(config, elementRef, renderer, 'header');
viewCtrl && viewCtrl._setHeader(this);
}
@@ -75,8 +74,7 @@ export class Header extends Ion {
export class Footer extends Ion {
constructor(config: Config, elementRef: ElementRef, renderer: Renderer, @Optional() viewCtrl: ViewController) {
super(config, elementRef, renderer);
this._setMode('footer', config.get('mode'));
super(config, elementRef, renderer, 'footer');
viewCtrl && viewCtrl._setFooter(this);
}
@@ -90,7 +88,7 @@ export class ToolbarBase extends Ion {
private _title: ToolbarTitle;
constructor(config: Config, elementRef: ElementRef, renderer: Renderer) {
super(config, elementRef, renderer);
super(config, elementRef, renderer, 'toolbar');
}
/**
@@ -269,7 +267,7 @@ export class Toolbar extends ToolbarBase {
*/
@Input()
set color(val: string) {
this._setColor('toolbar', val);
this._setColor(val);
}
/**
@@ -277,7 +275,7 @@ export class Toolbar extends ToolbarBase {
*/
@Input()
set mode(val: string) {
this._setMode('toolbar', val);
this._setMode( val);
}
constructor(
@@ -287,8 +285,6 @@ export class Toolbar extends ToolbarBase {
renderer: Renderer
) {
super(config, elementRef, renderer);
this.mode = config.get('mode');
this._sbPadding = config.getBoolean('statusbarPadding');
}