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 remote-tracking branch 'origin/2.0' into 2.0

Browse Source 
# Conflicts:
#	ionic/components/toast/toast.ts
This commit is contained in:
Brandy Carney
2016-04-21 13:50:32 -04:00
parent 25a43410ad 4cc2459e2e
commit 9d3e008520
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ import {ViewController} from '../nav/view-controller';
* this.nav.present(actionSheet);
* ```
*
* It's important to note that the the handler returns `false`. A feature of
* It's important to note that the handler returns `false`. A feature of
* button handlers is that they automatically dismiss the action sheet when their button
* was clicked, however, we'll need more control regarding the transition. Because
* the handler returns `false`, then the action sheet does not automatically dismiss

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

@@ -175,7 +175,7 @@ import {ViewController} from '../nav/view-controller';
* this.nav.present(alert);
* ```
*
* It's important to note that the the handler returns `false`. A feature of
* It's important to note that the handler returns `false`. A feature of
* button handlers is that they automatically dismiss the alert when their button
* was clicked, however, we'll need more control regarding the transition. Because
* the handler returns `false`, then the alert does not automatically dismiss

6
ionic/components/label/label.ts
View File

@@ -7,9 +7,9 @@ import {Directive, ElementRef, Renderer, Input, Optional, Attribute} from 'angul
* Labels are placed inside of an `ion-item` element and can be used
* to describe an `ion-input`, `ion-toggle`, `ion-checkbox`, and more.
*
* @property [fixed] - a persistant label that sits next the the input
* @property [floating] - a label that will float about the input if the input is empty of looses focus
* @property [stacked] - A stacked label will always appear on top of the input
* @property [fixed] - A persistant label that sits next the input.
* @property [floating] - A label that will float about the input if the input is empty of looses focus.
* @property [stacked] - A stacked label will always appear on top of the input.
*
* @usage

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

@@ -1399,7 +1399,7 @@ export class NavController extends Ion {
}
this._views.length = 0;
if (this.parent) {
if (this.parent && this.parent.unregisterChildNav) {
this.parent.unregisterChildNav(this);
}
}

4
ionic/platform/platform.ts
View File

@@ -152,9 +152,7 @@ export class Platform {
* }
* ```
*
* @param {string} [platformName] optional platformName
* @returns {object} An object with various platform info
*
* @returns {object} An object containing all of the platforms and their versions.
*/
versions(): {[name: string]: PlatformVersion} {
// get all the platforms that have a valid parsed version