Refactor and add change detection

primefaces · Apr 26, 2016 · eb0d902 · eb0d902
1 parent 5fdd03b
commit eb0d902
Showing 1 changed file with 22 additions and 5 deletions.
diff --git a/components/inputswitch/inputswitch.ts b/components/inputswitch/inputswitch.ts
@@ -67,6 +67,8 @@ export class InputSwitch implements ControlValueAccessor, AfterViewInit {
     private offLabelChild: any;
 
     private offset: any;
+
+    initialized: boolean = false;
 
     constructor(private el: ElementRef, private domHandler: DomHandler) {}
 
@@ -110,19 +112,27 @@ export class InputSwitch implements ControlValueAccessor, AfterViewInit {
             this.onContainer.style.width = 0 + 'px';
             this.onLabelChild.style.marginLeft = -this.offset + 'px';
         }
+
+        this.initialized = true;
     }
 
     toggle(event,checkbox) {
         if(!this.disabled) {
-            checkbox.focus();
-            this.checked = !this.checked;
-            this.checked ? this.checkUI() : this.uncheckUI();
+            if(this.checked) {
+                this.checked = false;
+                this.uncheckUI()
+            }
+            else {
+                this.checked = true;
+                this.checkUI();
+            }
+
             this.onModelChange(this.checked);
-            this.onModelTouched();
             this.onChange.emit({
                 originalEvent: event,
                 checked: this.checked
-            })
+            });
+            checkbox.focus();
         }
     }
 
@@ -151,6 +161,13 @@ export class InputSwitch implements ControlValueAccessor, AfterViewInit {
 
     writeValue(value: any) : void {
         this.value = value;
+
+        if(this.initialized) {
+            if(this.value === true)
+                this.checkUI();
+            else
+                this.uncheckUI();
+        }
     }
 
     registerOnChange(fn: Function): void {