From d3e6b36a28cc47584e26ebe241835b025471e882 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 22 Mar 2017 15:05:42 -0400 Subject: [PATCH 1/6] test(img): fix source path for the img --- src/components/img/test/basic/app.module.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/img/test/basic/app.module.ts b/src/components/img/test/basic/app.module.ts index b74f6c3f10..df95cc9886 100644 --- a/src/components/img/test/basic/app.module.ts +++ b/src/components/img/test/basic/app.module.ts @@ -20,17 +20,17 @@ export class E2EPage { { width: '100', height: '44', - src: '../img/img/batmobile.jpg' + src: '../img/batmobile.jpg' }, { width: '100', height: '75', - src: '../img/img/knight-rider.jpg' + src: '../img/knight-rider.jpg' }, { width: '100', height: '68', - src: '../img/img/general-lee.jpg' + src: '../img/general-lee.jpg' } ]; From e07aad460d2c3e1c3f3395dd5ecdcfb7d067c72e Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 22 Mar 2017 15:15:56 -0400 Subject: [PATCH 2/6] chore(ionic): release 2.3.0 --- CHANGELOG.md | 42 ++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9db9661b12..443ffb30e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,45 @@ + +# [2.3.0](https://github.com/driftyco/ionic/compare/v2.2.0...v2.3.0) (2017-03-22) + + +### Bug Fixes + +* **alert:** pass id to alert inputs ([46fe1ff](https://github.com/driftyco/ionic/commit/46fe1ff)), closes [#10603](https://github.com/driftyco/ionic/issues/10603) +* **datetime:** don't always disable day values when dayValues is set ([eff420f](https://github.com/driftyco/ionic/commit/eff420f)) +* **datetime:** move the call to picker.refresh() in generate ([58beea3](https://github.com/driftyco/ionic/commit/58beea3)) +* **datetime:** respect time limits in hours and minutes ([afd99ba](https://github.com/driftyco/ionic/commit/afd99ba)), closes [#6850](https://github.com/driftyco/ionic/issues/6850) +* **datetime:** update selectedIndex according to ngModel value ([74191c3](https://github.com/driftyco/ionic/commit/74191c3)) +* **infinite-scroll:** add event.timeStamp polyfill for firefox ([#10752](https://github.com/driftyco/ionic/issues/10752)) ([53feb3f](https://github.com/driftyco/ionic/commit/53feb3f)) +* **picker:** initialize the selectionIndex ([ba35306](https://github.com/driftyco/ionic/commit/ba35306)) +* **range:** update the bar width correctly ([b541832](https://github.com/driftyco/ionic/commit/b541832)), closes [#10150](https://github.com/driftyco/ionic/issues/10150) +* **range:** only activate knob B if range is dual ([d538245](https://github.com/driftyco/ionic/commit/d538245)) +* **scroll-view:** do not set initialized until it is enabled ([#10817](https://github.com/driftyco/ionic/issues/10817)) ([56364a0](https://github.com/driftyco/ionic/commit/56364a0)) +* **searchbar:** add IE support ([05859db](https://github.com/driftyco/ionic/commit/05859db)) +* **select:** make floating labels work for ion-select ([8c483f2](https://github.com/driftyco/ionic/commit/8c483f2)), closes [#10751](https://github.com/driftyco/ionic/issues/10751) +* **slides:** fix rtl support ([e90d692](https://github.com/driftyco/ionic/commit/e90d692)) +* **slides:** simulate touch events for query params ([#10579](https://github.com/driftyco/ionic/issues/10579)) ([e191321](https://github.com/driftyco/ionic/commit/e191321)), closes [#10577](https://github.com/driftyco/ionic/issues/10577) +* **toggle/checkbox:** trigger ui update when using virtalScroll with Angular Reactive Forms ([30980b6](https://github.com/driftyco/ionic/commit/30980b6)) +* **virtual-list:** make virtual-scroll work with infinite-scroll ([999efac](https://github.com/driftyco/ionic/commit/999efac)), closes [#9350](https://github.com/driftyco/ionic/issues/9350) [#9722](https://github.com/driftyco/ionic/issues/9722) [#9247](https://github.com/driftyco/ionic/issues/9247) [#10778](https://github.com/driftyco/ionic/issues/10778) +* **virtualscroll:** populate the nodes at the correct height ([51c398d](https://github.com/driftyco/ionic/commit/51c398d)) + + +### Features + +* **alert:** add attributes min & max to alert inputs ([d666e8b](https://github.com/driftyco/ionic/commit/d666e8b)) +* **alert:** add attributes min & max to alert inputs of type number ([b53219a](https://github.com/driftyco/ionic/commit/b53219a)) +* **infinite:** add scroll in opposite direction ([#8099](https://github.com/driftyco/ionic/issues/8099)) ([6918275](https://github.com/driftyco/ionic/commit/6918275)) +* **infinite-scroll:** add `waitFor` method to InfiniteScroll ([84e25a1](https://github.com/driftyco/ionic/commit/84e25a1)) +* **overlay:** add method chaining pattern to configure overlays ([bee75f7](https://github.com/driftyco/ionic/commit/bee75f7)) +* **range:** add ionFocus and ionBlur events ([#10761](https://github.com/driftyco/ionic/issues/10761)) ([8f310eb](https://github.com/driftyco/ionic/commit/8f310eb)) +* **split-pane:** support for side=right ([963cdcb](https://github.com/driftyco/ionic/commit/963cdcb)) + + +### Performance Improvements + +* **content:** scrollview magic activated on demand ([7e9bad5](https://github.com/driftyco/ionic/commit/7e9bad5)) + + + # [2.2.0](https://github.com/driftyco/ionic/compare/v2.1.0...v2.2.0) (2017-03-08) diff --git a/package.json b/package.json index c73aaa7dfd..6d5510fbdb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "ionic2", - "version": "2.2.0", + "version": "2.3.0", "description": "A powerful framework for building mobile and progressive web apps with JavaScript and Angular 2", "keywords": [ "ionic", From 4fbcda74402bb0464587e8faef5cc1a6cc136753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Fern=C3=A1ndez?= Date: Thu, 23 Mar 2017 12:52:15 +0100 Subject: [PATCH 3/6] fix(alert): add missing cssClass property for buttons Commit 46fe1ff53cfc2cfef152b560d01882eebca8c678 defined the `AlertButton` interface for the `buttons` array, but it's missing the `cssClass` property as described in the **Button options** section of the docs: http://ionicframework.com/docs/v2/api/components/alert/AlertController/#advanced --- src/components/alert/alert-options.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/alert/alert-options.ts b/src/components/alert/alert-options.ts index 74c9804ba5..39cd2e8030 100644 --- a/src/components/alert/alert-options.ts +++ b/src/components/alert/alert-options.ts @@ -27,5 +27,6 @@ export interface AlertInputOptions { export interface AlertButton { text?: string; role?: string; + cssClass?: string; handler?: Function; }; From 4e4e06898a32bd4fec05e9fa54c6d2026be94093 Mon Sep 17 00:00:00 2001 From: mhartington Date: Thu, 23 Mar 2017 08:44:10 -0500 Subject: [PATCH 4/6] docs(alert): fix input table --- src/components/alert/alert.ts | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/components/alert/alert.ts b/src/components/alert/alert.ts index 33490002c8..8488ae57ec 100644 --- a/src/components/alert/alert.ts +++ b/src/components/alert/alert.ts @@ -241,21 +241,17 @@ export class Alert extends ViewController { * * Input options * - * | Property | Type | Description | - * |-------------|-----------|-----------------------------------------------------------------| - * | type | `string` | The type the input should be: text, tel, number, etc. | - * | name | `string` | The name for the input. | - * | placeholder | `string` | The input's placeholder (for textual/numeric inputs) | - * | value | `string` | The input's value. | - * | label | `string` | The input's label (only for radio/checkbox inputs) | - * | checked | `boolean` | Whether or not the input is checked. | - * | id | `string` | The input's id. | - * | min | `string | number` | The input's minimum authorized value (string only for date inputs, number - * only for number inputs) - * | - * | max | `string | number` | The input's maximum authorized value (string only for date inputs, number - * only for number inputs) - * | + * | Property | Type | Description | + * |-------------|-----------------|---------------------------------------------------------------------------------------------------| + * | type | `string` | The type the input should be: text, tel, number, etc. | + * | name | `string` | The name for the input. | + * | placeholder | `string` | The input's placeholder (for textual/numeric inputs) | + * | value | `string` | The input's value. | + * | label | `string` | The input's label (only for radio/checkbox inputs) | + * | checked | `boolean` | Whether or not the input is checked. | + * | id | `string` | The input's id. | + * | min | `string/number` | The input's minimum authorized value (string only for date inputs, number only for number inputs) | + * | max | `string/number` | The input's maximum authorized value (string only for date inputs, number only for number inputs) | * * Button options * From a3ead3d7c8573040d8e9f96bdf3f5b7ea952166e Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Thu, 23 Mar 2017 17:38:56 +0100 Subject: [PATCH 5/6] test(alert): adds usage of button.cssClass references #10887 --- src/components/alert/alert-component.ts | 1 + src/components/alert/test/basic/app.module.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/alert/alert-component.ts b/src/components/alert/alert-component.ts index e55ea4df59..38b8076c66 100644 --- a/src/components/alert/alert-component.ts +++ b/src/components/alert/alert-component.ts @@ -72,6 +72,7 @@ import { AlertInputOptions, AlertOptions, AlertButton } from './alert-options'; encapsulation: ViewEncapsulation.None, }) export class AlertCmp { + activeId: string; descId: string; d: AlertOptions; diff --git a/src/components/alert/test/basic/app.module.ts b/src/components/alert/test/basic/app.module.ts index cce713319c..35869e428b 100644 --- a/src/components/alert/test/basic/app.module.ts +++ b/src/components/alert/test/basic/app.module.ts @@ -33,6 +33,7 @@ export class E2EPage { alert.addButton({ text: 'Cancel', role: 'cancel', + cssClass: 'secondary', handler: () => { console.log('Confirm Cancel'); this.testConfirmResult = 'Cancel'; From 58b57c0ca756e16e7dc9e0e47c8a4da288b0e84f Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Thu, 23 Mar 2017 17:54:14 +0100 Subject: [PATCH 6/6] fix(infinite-scroll): regression in #8099 references #10889 --- src/components/infinite-scroll/infinite-scroll.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/infinite-scroll/infinite-scroll.ts b/src/components/infinite-scroll/infinite-scroll.ts index f83ce91ec1..4741424c03 100644 --- a/src/components/infinite-scroll/infinite-scroll.ts +++ b/src/components/infinite-scroll/infinite-scroll.ts @@ -256,7 +256,7 @@ export class InfiniteScroll { let distanceFromInfinite: number; if (this._position === POSITION_BOTTOM) { - distanceFromInfinite = ((d.scrollHeight - infiniteHeight) - d.scrollTop) - height - threshold; + distanceFromInfinite = d.scrollHeight - infiniteHeight - d.scrollTop - height - threshold; } else { assert(this._position === POSITION_TOP, '_position should be top'); distanceFromInfinite = d.scrollTop - infiniteHeight - threshold; @@ -289,6 +289,10 @@ export class InfiniteScroll { * to `enabled`. */ complete() { + if (this.state !== STATE_LOADING) { + return; + } + if (this._position === POSITION_BOTTOM) { this.state = STATE_ENABLED; return;