Merge pull request json-editor#678 from hybtalented/master

bugfix: Object editor throw error in ie10 and multiple editor create the links twice
wang3690004 · Mar 18, 2020 · 74942e1 · 74942e1
2 parents e02ff01 + ab7cb96
commit 74942e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/editors/multiple.js b/src/editors/multiple.js
@@ -334,5 +334,8 @@ export class MultipleEditor extends AbstractEditor {
         editor.showValidationErrors(errors)
       })
     }
+  },
+  addLinks: function () {
+    // multiple editor itself don't create links
   }
 }
diff --git a/src/editors/object.js b/src/editors/object.js
@@ -770,7 +770,7 @@ export class ObjectEditor extends AbstractEditor {
         self.toggleEditJSON()
       })
       this.controls.appendChild(this.editjson_control)
-      this.controls.insertBefore(this.editjson_holder, this.controls.childNodes[1])
+      this.controls.insertBefore(this.editjson_holder, this.controls.childNodes[0])
 
       /* Edit JSON Buttton disabled */
       if (this.schema.options && typeof this.schema.options.disable_edit_json !== 'undefined') {