Skip to content

Commit d58a264

Browse files
committed
Version bump.
1 parent ff33cbe commit d58a264

File tree

4 files changed

+36
-15
lines changed

4 files changed

+36
-15
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "json-editor",
3-
"version": "0.6.15",
3+
"version": "0.6.16",
44
"authors": [
55
"Jeremy Dorn <[email protected]>"
66
],

dist/jsoneditor.js

+27-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*! JSON Editor v0.6.15 - JSON Schema -> HTML Editor
1+
/*! JSON Editor v0.6.16 - JSON Schema -> HTML Editor
22
* By Jeremy Dorn - https://github.com/jdorn/json-editor/
33
* Released under the MIT license
44
*
5-
* Date: 2014-06-17
5+
* Date: 2014-06-18
66
*/
77

88
/**
@@ -2125,7 +2125,10 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
21252125

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

21312134
this.register();
@@ -3805,7 +3808,7 @@ JSONEditor.defaults.editors.array = JSONEditor.AbstractEditor.extend({
38053808
});
38063809

38073810
if(controls_holder) {
3808-
controls_holder.appendChild(self.rows[i].moveup_button);
3811+
controls_holder.appendChild(self.rows[i].movedown_button);
38093812
}
38103813
}
38113814

@@ -5166,11 +5169,29 @@ JSONEditor.defaults.editors.multiselect = JSONEditor.AbstractEditor.extend({
51665169
}
51675170
},
51685171
enable: function() {
5169-
if(!this.always_disabled) this.input.disabled = false;
5172+
if(!this.always_disabled) {
5173+
if(this.input) {
5174+
this.input.disabled = false;
5175+
}
5176+
else if(this.inputs) {
5177+
for(var i in this.inputs) {
5178+
if(!this.inputs.hasOwnProperty(i)) continue;
5179+
this.inputs[i].disabled = false;
5180+
}
5181+
}
5182+
}
51705183
this._super();
51715184
},
51725185
disable: function() {
5173-
this.input.disabled = true;
5186+
if(this.input) {
5187+
this.input.disabled = true;
5188+
}
5189+
else if(this.inputs) {
5190+
for(var i in this.inputs) {
5191+
if(!this.inputs.hasOwnProperty(i)) continue;
5192+
this.inputs[i].disabled = true;
5193+
}
5194+
}
51745195
this._super();
51755196
}
51765197
});

dist/jsoneditor.min.js

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/intro.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*! JSON Editor v0.6.15 - JSON Schema -> HTML Editor
1+
/*! JSON Editor v0.6.16 - JSON Schema -> HTML Editor
22
* By Jeremy Dorn - https://github.com/jdorn/json-editor/
33
* Released under the MIT license
44
*
5-
* Date: 2014-06-17
5+
* Date: 2014-06-18
66
*/
77

88
/**

0 commit comments

Comments
 (0)