QuestionBoolean, fix a bug with defaultValue on loading from JSON: su…

…rveyjs#610
sebnor · Aug 31, 2017 · c7daca3 · c7daca3
1 parent 6281a5f
commit c7daca3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/knockout/koquestion_boolean.ts b/src/knockout/koquestion_boolean.ts
@@ -20,6 +20,9 @@ export class QuestionBooleanImplementor extends QuestionImplementor {
     protected setkoValue(newValue: any) {
         super.setkoValue(newValue);
         this.koIndeterminate((<QuestionBoolean>this.question).isIndeterminate);
+        if(this.koCheckedValue() != (<QuestionBoolean>this.question).checkedValue) {
+            this.koCheckedValue((<QuestionBoolean>this.question).checkedValue);
+        }
     }
     protected updateCheckedValue(newValue: any) {
         (<QuestionBoolean>this.question).checkedValue = newValue;

diff --git a/src/question_boolean.ts b/src/question_boolean.ts
@@ -27,6 +27,10 @@ export class QuestionBooleanModel extends Question {
         super.onSetData();
         this.updateValueWithDefaults();
     }
+    public onSurveyLoad() {
+        super.onSurveyLoad();
+        this.updateValueWithDefaults();
+    }
     /**
      * Get/set question value in 3 modes: indeterminate (value is empty), true (check is set) and false (check is unset).
      * @see valueTrue
@@ -81,9 +85,11 @@ export class QuestionBooleanModel extends Question {
     private getValueTrue(): any { return this.valueTrue ? this.valueTrue : true; }
     private getValueFalse(): any { return this.valueFalse ? this.valueFalse : false; }
     private updateValueWithDefaults() {
-        if(!this.isEmpty()) return;
-        if(this.defaultValue == "true") this.value = this.getValueTrue();
-        else if(this.defaultValue == "false") this.value = this.getValueFalse();
+        if(this.isLoadingFromJson) return;
+        if(!this.isEmpty() && !this.isDesignMode) return;
+        if(this.defaultValue == "true") this.checkedValue = true;
+        if(this.defaultValue == "false") this.checkedValue = false;
+        if(this.defaultValue == "indeterminate") this.value = null;
     }
 }