diff --git a/ionic/components/checkbox/checkbox.ts b/ionic/components/checkbox/checkbox.ts
index 7c0fbde8af..b47403a71d 100644
--- a/ionic/components/checkbox/checkbox.ts
+++ b/ionic/components/checkbox/checkbox.ts
@@ -25,7 +25,7 @@ const CHECKBOX_VALUE_ACCESSOR = new Provider(
*
*
* Pepperoni
- *
+ *
*
*
*
diff --git a/ionic/components/checkbox/test/basic/index.ts b/ionic/components/checkbox/test/basic/index.ts
index ec21c32181..0e0a75004a 100644
--- a/ionic/components/checkbox/test/basic/index.ts
+++ b/ionic/components/checkbox/test/basic/index.ts
@@ -26,7 +26,7 @@ class E2EApp {
constructor() {
this.fruitsForm = new ControlGroup({
- "appleCtrl": new Control(),
+ "appleCtrl": new Control(true),
"bananaCtrl": new Control(true),
"cherryCtrl": new Control(false),
"grapeCtrl": new Control(true)
diff --git a/ionic/components/select/select.ts b/ionic/components/select/select.ts
index b552f72ced..41942a137c 100644
--- a/ionic/components/select/select.ts
+++ b/ionic/components/select/select.ts
@@ -320,10 +320,18 @@ export class Select {
* @private
*/
writeValue(val: any) {
+ console.debug('select, writeValue', val);
this._values = (Array.isArray(val) ? val : isBlank(val) ? [] : [val]);
this._updOpts();
}
+ /**
+ * @private
+ */
+ ngAfterContentInit() {
+ this._updOpts();
+ }
+
/**
* @private
*/
diff --git a/ionic/components/select/test/multiple-value/index.ts b/ionic/components/select/test/multiple-value/index.ts
index e2fdaa7a53..ecedff89d8 100644
--- a/ionic/components/select/test/multiple-value/index.ts
+++ b/ionic/components/select/test/multiple-value/index.ts
@@ -5,12 +5,19 @@ import {App, Page} from '../../../../../ionic/ionic';
templateUrl: 'main.html'
})
class E2EPage {
+ toppings: Array;
+ carFeatures: Array;
+ pets: Array;
+ petOptions: Array<{text: string, value: string}>;
constructor() {
+ this.toppings = ['bacon', 'xcheese'];
+ this.carFeatures = [];
+ this.pets = ['cat', 'dog'];
this.petOptions = [
{ text: 'Bird', value: 'bird' },
- { text: 'Cat', value: 'cat', checked: true },
- { text: 'Dog', value: 'dog', checked: true },
+ { text: 'Cat', value: 'cat' },
+ { text: 'Dog', value: 'dog' },
{ text: 'Honey Badger', value: 'honeybadger' },
{ text: 'Pig', value: 'pig' },
];
@@ -27,6 +34,8 @@ class E2EPage {
template: ''
})
class E2EApp {
+ root;
+
constructor() {
this.root = E2EPage;
}
diff --git a/ionic/components/select/test/multiple-value/main.html b/ionic/components/select/test/multiple-value/main.html
index f2ffdcf7df..7c0cbeb383 100644
--- a/ionic/components/select/test/multiple-value/main.html
+++ b/ionic/components/select/test/multiple-value/main.html
@@ -7,9 +7,9 @@
Toppings
- Bacon
+ Bacon
Black Olives
- Extra Cheese
+ Extra Cheese
Green Peppers
Mushrooms
Onions
@@ -35,7 +35,7 @@
Pets
- {{o.text}}
+ {{o.text}}
diff --git a/ionic/components/select/test/single-value/index.ts b/ionic/components/select/test/single-value/index.ts
index 11f108b5fe..0c1bd8365b 100644
--- a/ionic/components/select/test/single-value/index.ts
+++ b/ionic/components/select/test/single-value/index.ts
@@ -7,8 +7,19 @@ import {App, Page} from '../../../../../ionic/ionic';
class E2EPage {
musicAlertOpts;
gender: string;
+ gaming: string;
+ os: string;
+ music: string;
+ month: string;
+ year: string;
constructor() {
+ this.gaming = '';
+ this.os = 'win3.1';
+ this.music = null;
+ this.month = '12';
+ this.year = '1994';
+
this.musicAlertOpts = {
title: '1994 Music',
subTitle: 'Select your favorite'
diff --git a/ionic/components/select/test/single-value/main.html b/ionic/components/select/test/single-value/main.html
index fdd7f3f72b..2082716d49 100644
--- a/ionic/components/select/test/single-value/main.html
+++ b/ionic/components/select/test/single-value/main.html
@@ -31,7 +31,7 @@
Linux
Mac OS 7
Mac OS 8
- Windows 3.1
+ Windows 3.1
Windows 95
Windows 98
@@ -64,7 +64,7 @@
September
October
November
- December
+ December
1989
@@ -72,7 +72,7 @@
1991
1992
1993
- 1994
+ 1994
1995
1996
1997
diff --git a/ionic/components/toggle/test/basic/index.ts b/ionic/components/toggle/test/basic/index.ts
index 492db13db5..14930b585e 100644
--- a/ionic/components/toggle/test/basic/index.ts
+++ b/ionic/components/toggle/test/basic/index.ts
@@ -24,7 +24,7 @@ class E2EApp {
constructor() {
this.fruitsForm = new ControlGroup({
- "appleCtrl": new Control(),
+ "appleCtrl": new Control(false),
"bananaCtrl": new Control(true),
"cherryCtrl": new Control(false),
"grapeCtrl": new Control(true)
@@ -33,8 +33,8 @@ class E2EApp {
this.grapeChecked = true;
this.grapeDisabled = true;
- this.kiwiModel = false;
- this.strawberryModel = true;
+ this.kiwiModel = true;
+ this.strawberryModel = false;
}
toggleGrapeChecked() {
diff --git a/ionic/components/toggle/toggle.ts b/ionic/components/toggle/toggle.ts
index a7902964b1..351cf33098 100644
--- a/ionic/components/toggle/toggle.ts
+++ b/ionic/components/toggle/toggle.ts
@@ -31,7 +31,7 @@ const TOGGLE_VALUE_ACCESSOR = new Provider(
*
*
* Pepperoni
- *
+ *
*
*
*