From 7b853dba16c49e2d2a813f48ec8d8eba148446cf Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Sat, 9 May 2015 13:01:48 -0500 Subject: [PATCH] Tweaks --- ionic/components/switch/switch.js | 3 ++- ionic/components/switch/test/basic/main.html | 11 ++++++++++- ionic/components/switch/test/basic/main.js | 4 +++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ionic/components/switch/switch.js b/ionic/components/switch/switch.js index 6c7e54c3e5..d7f9a79a41 100644 --- a/ionic/components/switch/switch.js +++ b/ionic/components/switch/switch.js @@ -70,7 +70,8 @@ export class Switch { * ControlDirective to update the value internally. */ writeValue(value) { - this.checked = value; + // Convert it to a boolean + this.checked = !!value; } diff --git a/ionic/components/switch/test/basic/main.html b/ionic/components/switch/test/basic/main.html index a17edbe532..b34661d2e2 100644 --- a/ionic/components/switch/test/basic/main.html +++ b/ionic/components/switch/test/basic/main.html @@ -8,10 +8,19 @@ Enable Fun? - + + Enable Ice Cream? + + + Enable Pizza? + Is fun enabled? {{form.controls.enableFun.value}} +
+ Is ice cream enabled? {{form.controls.enableIceCream.value}} +
+ Is pizza enabled? {{form.controls.enablePizza.value}} diff --git a/ionic/components/switch/test/basic/main.js b/ionic/components/switch/test/basic/main.js index 1a4714444d..73c8840c6e 100644 --- a/ionic/components/switch/test/basic/main.js +++ b/ionic/components/switch/test/basic/main.js @@ -12,7 +12,9 @@ class IonicApp { var fb = new FormBuilder(); this.form = fb.group({ - enableFun: ['', Validators.required] + enableFun: ['', Validators.required], + enableIceCream: [false, Validators.required], + enablePizza: [true, Validators.required] }); }