fix(toggle/checkbox): allow value to be programmatically updated whil…

…e disabled fixes #9730
ionic-team · Feb 3, 2017 · 37c7117 · 37c7117
1 parent 2ed0e12
commit 37c7117
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/src/components/checkbox/checkbox.ts b/src/components/checkbox/checkbox.ts
@@ -158,7 +158,7 @@ export class Checkbox extends Ion implements IonicTapInput, AfterContentInit, Co
    * @private
    */
   _setChecked(isChecked: boolean) {
-    if (!this._disabled && isChecked !== this._checked) {
+    if (isChecked !== this._checked) {
       this._checked = isChecked;
       if (this._init) {
         this.ionChange.emit(this);

diff --git a/src/components/checkbox/test/basic/app.module.ts b/src/components/checkbox/test/basic/app.module.ts
@@ -27,6 +27,9 @@ export class E2EPage {
     'grape': this.grapeCtrl
   });
 
+  public checked: boolean = false;
+  public disabled: boolean = false;
+
   constructor() {
     this.grapeChecked = true;
     this.standAloneChecked = true;

diff --git a/src/components/checkbox/test/basic/main.html b/src/components/checkbox/test/basic/main.html
@@ -88,4 +88,20 @@
 
   <pre aria-hidden="true" padding>{{formResults}}</pre>
 
+  <ion-item>
+    <ion-label>Checkbox / Toggle</ion-label>
+    <ion-checkbox [(ngModel)]="checked" [disabled]="disabled"></ion-checkbox>
+    <ion-toggle [(ngModel)]="checked" [disabled]="disabled"></ion-toggle>
+  </ion-item>
+  <ion-item>
+    <ion-label>checked</ion-label>
+    <ion-checkbox [(ngModel)]="checked"></ion-checkbox>
+    <ion-toggle [(ngModel)]="checked"></ion-toggle>
+  </ion-item>
+  <ion-item>
+    <ion-label>disabled</ion-label>
+    <ion-checkbox [(ngModel)]="disabled"></ion-checkbox>
+    <ion-toggle [(ngModel)]="disabled"></ion-toggle>
+  </ion-item>
+
 </ion-content>
diff --git a/src/components/toggle/toggle.ts b/src/components/toggle/toggle.ts
@@ -229,7 +229,7 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
    * @private
    */
   _setChecked(isChecked: boolean) {
-    if (!this._disabled && isChecked !== this._checked) {
+    if (isChecked !== this._checked) {
       this._checked = isChecked;
       if (this._init) {
         this.ionChange.emit(this);