Skip to content

Commit

Permalink
Version bump.
Browse files Browse the repository at this point in the history
  • Loading branch information
jdorn committed Jun 18, 2014
1 parent ff33cbe commit d58a264
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 15 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "json-editor",
"version": "0.6.15",
"version": "0.6.16",
"authors": [
"Jeremy Dorn <[email protected]>"
],
Expand Down
33 changes: 27 additions & 6 deletions dist/jsoneditor.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*! JSON Editor v0.6.15 - JSON Schema -> HTML Editor
/*! JSON Editor v0.6.16 - JSON Schema -> HTML Editor
* By Jeremy Dorn - https://github.com/jdorn/json-editor/
* Released under the MIT license
*
* Date: 2014-06-17
* Date: 2014-06-18
*/

/**
Expand Down Expand Up @@ -2125,7 +2125,10 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({

// Any special formatting that needs to happen after the input is added to the dom
requestAnimationFrame(function() {
self.afterInputReady();
// Skip in case the input is only a temporary editor,
// otherwise, in the case of an ace_editor creation,
// it will generate an error trying to append it to the missing parentNode
if(self.input.parentNode) self.afterInputReady();
});

this.register();
Expand Down Expand Up @@ -3805,7 +3808,7 @@ JSONEditor.defaults.editors.array = JSONEditor.AbstractEditor.extend({
});

if(controls_holder) {
controls_holder.appendChild(self.rows[i].moveup_button);
controls_holder.appendChild(self.rows[i].movedown_button);
}
}

Expand Down Expand Up @@ -5166,11 +5169,29 @@ JSONEditor.defaults.editors.multiselect = JSONEditor.AbstractEditor.extend({
}
},
enable: function() {
if(!this.always_disabled) this.input.disabled = false;
if(!this.always_disabled) {
if(this.input) {
this.input.disabled = false;
}
else if(this.inputs) {
for(var i in this.inputs) {
if(!this.inputs.hasOwnProperty(i)) continue;
this.inputs[i].disabled = false;
}
}
}
this._super();
},
disable: function() {
this.input.disabled = true;
if(this.input) {
this.input.disabled = true;
}
else if(this.inputs) {
for(var i in this.inputs) {
if(!this.inputs.hasOwnProperty(i)) continue;
this.inputs[i].disabled = true;
}
}
this._super();
}
});
Expand Down
12 changes: 6 additions & 6 deletions dist/jsoneditor.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/intro.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*! JSON Editor v0.6.15 - JSON Schema -> HTML Editor
/*! JSON Editor v0.6.16 - JSON Schema -> HTML Editor
* By Jeremy Dorn - https://github.com/jdorn/json-editor/
* Released under the MIT license
*
* Date: 2014-06-17
* Date: 2014-06-18
*/

/**
Expand Down

0 comments on commit d58a264

Please sign in to comment.