Fix bug with EpicEditor integration. Fixes #92

jdorn · Apr 27, 2014 · 6342626 · 6342626
1 parent a5c936f
commit 6342626
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/dist/jsoneditor.js b/dist/jsoneditor.js
@@ -1,4 +1,4 @@
-/*! JSON Editor v0.6.3 - JSON Schema -> HTML Editor
+/*! JSON Editor v0.6.4 - JSON Schema -> HTML Editor
  * By Jeremy Dorn - https://github.com/jdorn/json-editor/
  * Released under the MIT license
  *
@@ -2124,19 +2124,18 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
           clientSideStorage: false
         });
 
-        this.epiceditor = new EpicEditor(options);
+        this.epiceditor = new EpicEditor(options).load();
 
         this.epiceditor.importFile(null,this.getValue());
 
         this.epiceditor.on('update',function() {
           var val = self.epiceditor.exportFile();
           self.input.value = val;
+          self.value = val;
           if(self.parent) self.parent.onChildEditorChange(self);
           else self.jsoneditor.onChange();
           self.jsoneditor.notifyWatchers(self.path);
         });
-
-        this.epiceditor.load();
       }
       // ACE editor for everything else
       else if(window.ace) {

diff --git a/dist/jsoneditor.min.js b/dist/jsoneditor.min.js
diff --git a/src/editors/string.js b/src/editors/string.js
@@ -353,19 +353,18 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
           clientSideStorage: false
         });
 
-        this.epiceditor = new EpicEditor(options);
+        this.epiceditor = new EpicEditor(options).load();
 
         this.epiceditor.importFile(null,this.getValue());
 
         this.epiceditor.on('update',function() {
           var val = self.epiceditor.exportFile();
           self.input.value = val;
+          self.value = val;
           if(self.parent) self.parent.onChildEditorChange(self);
           else self.jsoneditor.onChange();
           self.jsoneditor.notifyWatchers(self.path);
         });
-
-        this.epiceditor.load();
       }
       // ACE editor for everything else
       else if(window.ace) {

diff --git a/src/intro.js b/src/intro.js
@@ -1,4 +1,4 @@
-/*! JSON Editor v0.6.3 - JSON Schema -> HTML Editor
+/*! JSON Editor v0.6.4 - JSON Schema -> HTML Editor
  * By Jeremy Dorn - https://github.com/jdorn/json-editor/
  * Released under the MIT license
  *