chore(): remove navbarStyle/tabbarStyle configs

This commit is contained in:
Adam Bradley
2015-12-09 09:46:55 -06:00
parent 05aaa2d34d
commit 6ca7e357b6
3 changed files with 3 additions and 18 deletions

View File

@ -82,8 +82,7 @@ class ToolbarBackground {
'class': 'toolbar' 'class': 'toolbar'
}, },
inputs: [ inputs: [
'hideBackButton', 'hideBackButton'
'navbarStyle'
], ],
directives: [BackButton, BackButtonText, Icon, ToolbarBackground] directives: [BackButton, BackButtonText, Icon, ToolbarBackground]
}) })
@ -100,11 +99,6 @@ export class Navbar extends ToolbarBase {
this.app = app; this.app = app;
this.renderer = renderer; this.renderer = renderer;
let navbarStyle = config.get('navbarStyle');
if (navbarStyle) {
renderer.setElementAttribute(elementRef, navbarStyle, '');
}
viewCtrl && viewCtrl.setNavbar(this); viewCtrl && viewCtrl.setNavbar(this);
this.bbIcon = config.get('backButtonIcon'); this.bbIcon = config.get('backButtonIcon');
@ -120,10 +114,6 @@ export class Navbar extends ToolbarBase {
if (typeof hideBackButton === 'string') { if (typeof hideBackButton === 'string') {
this.hideBackButton = (hideBackButton === '' || hideBackButton === 'true'); this.hideBackButton = (hideBackButton === '' || hideBackButton === 'true');
} }
if (this.navbarStyle) {
this.renderer.setElementAttribute(this.elementRef, this.navbarStyle, '');
}
} }
/** /**

View File

@ -39,7 +39,6 @@ import {rafFrames} from '../../util/dom';
defaultInputs: { defaultInputs: {
'tabbarPlacement': 'bottom', 'tabbarPlacement': 'bottom',
'tabbarIcons': 'top', 'tabbarIcons': 'top',
'tabbarStyle': 'default',
'preloadTabs': false 'preloadTabs': false
}, },
template: template:
@ -47,7 +46,7 @@ import {rafFrames} from '../../util/dom';
'<template navbar-anchor></template>' + '<template navbar-anchor></template>' +
'</ion-navbar-section>' + '</ion-navbar-section>' +
'<ion-tabbar-section>' + '<ion-tabbar-section>' +
'<tabbar role="tablist" [attr]="tabbarStyle">' + '<tabbar role="tablist">' +
'<a *ng-for="#t of _tabs" [tab]="t" class="tab-button" role="tab">' + '<a *ng-for="#t of _tabs" [tab]="t" class="tab-button" role="tab">' +
'<icon [name]="t.tabIcon" [is-active]="t.isSelected" class="tab-button-icon"></icon>' + '<icon [name]="t.tabIcon" [is-active]="t.isSelected" class="tab-button-icon"></icon>' +
'<span class="tab-button-text">{{t.tabTitle}}</span>' + '<span class="tab-button-text">{{t.tabTitle}}</span>' +

View File

@ -104,11 +104,7 @@ class Tab3 {}
<ion-tab tab-title="Schedule" tab-icon="globe" [root]="root2"></ion-tab> <ion-tab tab-title="Schedule" tab-icon="globe" [root]="root2"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="stopwatch" [root]="root3"></ion-tab> <ion-tab tab-title="Stopwatch" tab-icon="stopwatch" [root]="root3"></ion-tab>
</ion-tabs> </ion-tabs>
`, `
config: {
navbarStyle: 'secondary',
tabbarStyle: 'secondary'
}
}) })
export class TabsPage { export class TabsPage {
constructor() { constructor() {