From a41c7253372c06f66caea9afde2ce41ac7275437 Mon Sep 17 00:00:00 2001 From: Mariano Conti Date: Wed, 20 Apr 2016 22:03:53 -0300 Subject: [PATCH 1/5] Fix typo --- demos/toast/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/toast/index.ts b/demos/toast/index.ts index 20ce887657..d49af6a0cb 100644 --- a/demos/toast/index.ts +++ b/demos/toast/index.ts @@ -35,7 +35,7 @@ class ApiPage { showToastWithCloseButton() { const toast = Toast.create({ - message: 'Your internet connection appears to be offline. Data integrity is not gauranteed.', + message: 'Your internet connection appears to be offline. Data integrity is not guaranteed.', showCloseButton: true, closeButtonText: 'Ok' }); From 5735b67e7ec240ee228cc7313a977cf57d66eb2f Mon Sep 17 00:00:00 2001 From: Ignat Ignatov Date: Thu, 21 Apr 2016 14:25:21 +0200 Subject: [PATCH 2/5] Updated the API-docs for platform.versions(). --- ionic/platform/platform.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ionic/platform/platform.ts b/ionic/platform/platform.ts index 119bae2fcd..245cd35574 100644 --- a/ionic/platform/platform.ts +++ b/ionic/platform/platform.ts @@ -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 From f3ddb0bfd1e04d8f8431c5c8bc81a49652407926 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 21 Apr 2016 11:15:20 -0500 Subject: [PATCH 3/5] fix(nav): tabs should not dereg child navs Closes #6267 --- ionic/components/nav/nav-controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts index 4ad642ce1b..56b172ba83 100644 --- a/ionic/components/nav/nav-controller.ts +++ b/ionic/components/nav/nav-controller.ts @@ -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); } } From 7df7fba038863c9fe3f3007a0a81f30ff41231ff Mon Sep 17 00:00:00 2001 From: Ignat Ignatov Date: Thu, 21 Apr 2016 18:25:51 +0200 Subject: [PATCH 4/5] Added a note about platform.versions(). (#6265) docs(changelog): add a note about platform.versions() --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17ab2c2766..7dccf02fd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,8 @@ All methods have been documented in the API docs: http://ionicframework.com/docs/v2/api/components/slides/Slides/ +* **platform:** `platform.versions()` no longer accepts an optional parameter for platform name +and now returns only an object containing all of the platforms and their versions. # [2.0.0-beta.4](https://github.com/driftyco/ionic/compare/v2.0.0-beta.3...v2.0.0-beta.4) (2016-04-07) From 4cc2459e2e215199575c17e7572c03d20020455b Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 21 Apr 2016 11:34:26 -0500 Subject: [PATCH 5/5] docs(): fix the the --- ionic/components/action-sheet/action-sheet.ts | 2 +- ionic/components/alert/alert.ts | 2 +- ionic/components/label/label.ts | 6 +++--- ionic/components/toast/toast.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ionic/components/action-sheet/action-sheet.ts b/ionic/components/action-sheet/action-sheet.ts index 80550773cf..e6578d9bc9 100644 --- a/ionic/components/action-sheet/action-sheet.ts +++ b/ionic/components/action-sheet/action-sheet.ts @@ -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 diff --git a/ionic/components/alert/alert.ts b/ionic/components/alert/alert.ts index 1236a30915..12f1b64d2a 100644 --- a/ionic/components/alert/alert.ts +++ b/ionic/components/alert/alert.ts @@ -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 diff --git a/ionic/components/label/label.ts b/ionic/components/label/label.ts index 280c4d8366..193fbdd1fa 100644 --- a/ionic/components/label/label.ts +++ b/ionic/components/label/label.ts @@ -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 diff --git a/ionic/components/toast/toast.ts b/ionic/components/toast/toast.ts index 89ce8b4d94..4197c7ae0f 100644 --- a/ionic/components/toast/toast.ts +++ b/ionic/components/toast/toast.ts @@ -80,7 +80,7 @@ export class Toast extends ViewController { * | cssClass | `string` | Any additional class for the toast *(optional)* | * | showCloseButton | `boolean` | Whether or not to show an optional button to close the toast. *(optional)* | * | closeButtonText | `string` | Text to display in the close button. *(optional)* | - * | enableBackdropDismiss | `boolean` | Whether the the toast should be dismissed by tapping the backdrop *(optional)* | + * | enableBackdropDismiss | `boolean` | Whether the toast should be dismissed by tapping the backdrop *(optional)* | * * @param {object} ToastOptions Toast. See the above table for available options. */