Fix unit tests

surveyjs · Nov 2, 2024 · aa37501 · aa37501
1 parent 308dd10
commit aa37501
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/packages/survey-creator-core/src/creator-base.ts b/packages/survey-creator-core/src/creator-base.ts
@@ -2140,24 +2140,26 @@ export class SurveyCreatorModel extends Base
     if (!value) {
       this.initSurveyWithJSON(undefined, clearState);
     } else {
-      let jsonText = trustJSON ? JSON.parse(value) : undefined;
+      let jsonValue = trustJSON ? this.parseJSON(value) : undefined;
       if(!trustJSON) {
         const textWorker = new SurveyTextWorker(value);
         if(textWorker.isJsonCorrect) {
-          jsonText = value;
+          jsonValue = this.parseJSON(value);
         }
         else if(!!textWorker.survey) {
-          jsonText = textWorker.survey.toJSON();
+          jsonValue = textWorker.survey.toJSON();
         }
       }
-      if (!!jsonText) {
-        this.initSurveyWithJSON(jsonText, clearState);
+      if (!!jsonValue) {
+        this.initSurveyWithJSON(jsonValue, clearState);
       } else {
         this.viewType = "editor";
       }
     }
   }
-
+  private parseJSON(val: string): any {
+    return new SurveyJSON5().parse(val);
+  }
   /**
    * A survey JSON schema as a string.
    *