fix(radio): radio group now has bigger priority when setting value an…

…d disabled (#841)
akveo · Oct 1, 2018 · 99acd25 · 99acd25
1 parent a7ed638
commit 99acd25
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/framework/theme/components/radio/radio-group.component.ts b/src/framework/theme/components/radio/radio-group.component.ts
@@ -137,19 +137,15 @@ export class NbRadioGroupComponent implements AfterContentInit, OnDestroy, Contr
   }
 
   protected updateValues() {
-    if (this.radios) {
+    if (this.radios && typeof this.value !== 'undefined') {
       this.radios.forEach((radio: NbRadioComponent) => radio.checked = radio.value === this.value);
       this.markRadiosForCheck();
     }
   }
 
   protected updateDisabled() {
-    if (this.radios) {
-      this.radios.forEach((radio: NbRadioComponent) => {
-        if (!radio.hasOwnProperty('disabled')) {
-          radio.setDisabled = this.disabled
-        }
-      });
+    if (this.radios && typeof this.disabled !== 'undefined') {
+      this.radios.forEach((radio: NbRadioComponent) => radio.setDisabled = this.disabled);
       this.markRadiosForCheck();
     }
   }