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

Merge branch 'master' into list-border-refactor

Browse Source
This commit is contained in:
Brandy Carney
2015-11-16 16:43:00 -05:00
parent 5265f21062 df3a59dc81
commit f2a763a289
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ionic/components/icon/icon.ts
View File

@ -60,9 +60,6 @@ export class Icon {
this.update(); this.update();
} }
/**
* @private
*/
get isActive() { get isActive() {
return (this._isActive === undefined || this._isActive === true || this._isActive === 'true'); return (this._isActive === undefined || this._isActive === true || this._isActive === 'true');
} }

2
ionic/components/nav/nav.ts
View File

@ -41,7 +41,7 @@ import {ViewController} from './view-controller';
* *
* Additionally, specifying the `swipe-back-enabled` property will allow you to * Additionally, specifying the `swipe-back-enabled` property will allow you to
* swipe to go back: * swipe to go back:
* ```ts * ```html
* <ion-nav swipe-back-enabled="false" [root]="rootPage"></ion-nav> * <ion-nav swipe-back-enabled="false" [root]="rootPage"></ion-nav>
* ``` * ```
* *

4
ionic/components/tabs/tabs.ts
View File

@ -26,7 +26,7 @@ import {Icon} from '../icon/icon';
* To override the platform specific TabBar placement, use the * To override the platform specific TabBar placement, use the
* `tabbar-placement` property: * `tabbar-placement` property:
* *
* ```ts * ```html
* <ion-tabs tabbar-placement="top"> * <ion-tabs tabbar-placement="top">
* <ion-tab [root]="tabRoot"></ion-tab> * <ion-tab [root]="tabRoot"></ion-tab>
* </ion-tabs> * </ion-tabs>
@ -34,7 +34,7 @@ import {Icon} from '../icon/icon';
* *
* To change the location of the icons in the TabBar, use the `tabbar-icons` * To change the location of the icons in the TabBar, use the `tabbar-icons`
* property: * property:
* ```ts * ```html
* <ion-tabs tabbar-icons="bottom"> * <ion-tabs tabbar-icons="bottom">
* <ion-tab [root]="tabRoot"></ion-tab> * <ion-tab [root]="tabRoot"></ion-tab>
* </ion-tabs> * </ion-tabs>