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

Merge branch 'master' into css-refactor

Browse Source
This commit is contained in:
Brandy Carney
2015-12-09 15:05:21 -05:00
parent b20405a06d 12dd6b4f38
commit 7c78d22ad5
11 changed files with 107 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ionic/components/action-sheet/action-sheet.ts
View File

@@ -109,6 +109,7 @@ class ActionSheetCmp {
* }
* ```
*
* @demo /docs/v2/demos/action-sheet/
* @see {@link /docs/v2/components#action-sheets ActionSheet Component Docs}
*/
@Injectable()

18
ionic/components/show-hide-when/show-hide-when.ts
View File

@@ -53,12 +53,15 @@ class DisplayWhen {
/**
*
* The `show-when` attribute takes a value or expression, and only shows the element it has been added to when
* the value or expression is true. Complements the [hide-when attribute](../HideWhen).
* The `show-when` attribute takes a string that represents a plaform or screen orientation.
* The element the attribute is added to will only be shown when that platform or screen orientation is active.
* Complements the [hide-when attribute](../HideWhen).
* @usage
* ```html
* <div show-when="false">I am hidden!</div>
* <div show-when="ios">I am only visible on iOS!</div>
* ```
* @demo /docs/v2/demos/show-when/
* @see {@link ../HideWhen HideWhen API Docs}
*/
@Directive({
selector: '[show-when]',
@@ -87,12 +90,15 @@ export class ShowWhen extends DisplayWhen {
/**
*
* The `hide-when` attribute takes a value or expression, and hides the element it has been added to when
* the value or expression is true. Complements the [show-when attribute](../ShowWhen).
* The `hide-when` attribute takes a string that represents a plaform or screen orientation.
* The element the attribute is added to will only be hidden when that platform or screen orientation is active.
* Complements the [show-when attribute](../ShowWhen).
* @usage
* ```html
* <div hide-when="true">I am hidden!</div>
* <div hide-when="android">I am hidden on Android!</div>
* ```
* @demo /docs/v2/demos/hide-when/
* @see {@link ../ShowWhen ShowWhen API Docs}
*/
@Directive({
selector: '[hide-when]',