Skip to content

Commit 27f2e16

Browse files
committed
Version bump to 0.7.15
1 parent fab9371 commit 27f2e16

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "json-editor",
3-
"version": "0.7.14",
3+
"version": "0.7.15",
44
"authors": [
55
"Jeremy Dorn <[email protected]>"
66
],

dist/jsoneditor.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*! JSON Editor v0.7.14 - JSON Schema -> HTML Editor
1+
/*! JSON Editor v0.7.15 - JSON Schema -> HTML Editor
22
* By Jeremy Dorn - https://github.com/jdorn/json-editor/
33
* Released under the MIT license
44
*
5-
* Date: 2015-01-25
5+
* Date: 2015-02-02
66
*/
77

88
/**
@@ -169,7 +169,7 @@ var $extend = function(destination) {
169169
var $each = function(obj,callback) {
170170
if(!obj) return;
171171
var i;
172-
if(typeof obj.length !== 'undefined') {
172+
if(typeof obj.length === 'number') {
173173
for(i=0; i<obj.length; i++) {
174174
if(callback(i,obj[i])===false) return;
175175
}
@@ -4296,7 +4296,7 @@ JSONEditor.defaults.editors.multiple = JSONEditor.AbstractEditor.extend({
42964296
$each(self.editors,function(type,editor) {
42974297
if(!editor) return;
42984298
if(self.type === type) {
4299-
editor.setValue(current_value,true);
4299+
if(self.keep_values) editor.setValue(current_value,true);
43004300
editor.container.style.display = '';
43014301
}
43024302
else editor.container.style.display = 'none';
@@ -4357,6 +4357,10 @@ JSONEditor.defaults.editors.multiple = JSONEditor.AbstractEditor.extend({
43574357
this.type = 0;
43584358
this.editors = [];
43594359
this.validators = [];
4360+
4361+
this.keep_values = true;
4362+
if(typeof this.jsoneditor.options.keep_oneof_values !== "undefined") this.keep_values = this.jsoneditor.options.keep_oneof_values;
4363+
if(typeof this.options.keep_oneof_values !== "undefined") this.keep_values = this.options.keep_oneof_values;
43604364

43614365
if(this.schema.oneOf) {
43624366
this.oneOf = true;

dist/jsoneditor.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "json-editor",
33
"title": "JSONEditor",
44
"description": "JSON Schema based editor",
5-
"version": "0.7.14",
5+
"version": "0.7.15",
66
"main": "dist/jsoneditor.js",
77
"author": {
88
"name": "Jeremy Dorn",

src/intro.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*! JSON Editor v0.7.14 - JSON Schema -> HTML Editor
1+
/*! JSON Editor v0.7.15 - JSON Schema -> HTML Editor
22
* By Jeremy Dorn - https://github.com/jdorn/json-editor/
33
* Released under the MIT license
44
*
5-
* Date: 2015-01-25
5+
* Date: 2015-02-02
66
*/
77

88
/**

0 commit comments

Comments
 (0)