Skip to content

Commit 7c54574

Browse files
committed
Version bump 0.7.8
1 parent 79d0697 commit 7c54574

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
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.7.7",
3+
"version": "0.7.8",
44
"authors": [
55
"Jeremy Dorn <[email protected]>"
66
],

dist/jsoneditor.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*! JSON Editor v0.7.7 - JSON Schema -> HTML Editor
1+
/*! JSON Editor v0.7.8 - JSON Schema -> HTML Editor
22
* By Jeremy Dorn - https://github.com/jdorn/json-editor/
33
* Released under the MIT license
44
*
5-
* Date: 2014-08-21
5+
* Date: 2014-08-28
66
*/
77

88
/**
@@ -1863,7 +1863,7 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
18631863
if(this.enumSource[i].title) {
18641864
this.enumSource[i].title = this.jsoneditor.compileTemplate(this.enumSource[i].title, this.template_engine);
18651865
}
1866-
if(this.enumSource[i].fillter) {
1866+
if(this.enumSource[i].filter) {
18671867
this.enumSource[i].filter = this.jsoneditor.compileTemplate(this.enumSource[i].filter, this.template_engine);
18681868
}
18691869
}
@@ -2053,7 +2053,7 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
20532053
emoticonsEnabled: false,
20542054
width: '100%',
20552055
height: 300
2056-
},JSONEditor.plugins.sceditor);
2056+
},JSONEditor.plugins.sceditor,self.options.sceditor_options||{});
20572057

20582058
window.jQuery(self.input).sceditor(options);
20592059

@@ -4615,7 +4615,7 @@ JSONEditor.defaults.editors.enum = JSONEditor.AbstractEditor.extend({
46154615
return 4;
46164616
},
46174617
build: function() {
4618-
var container = this.getContainer();
4618+
var container = this.container;
46194619
this.title = this.header = this.label = this.theme.getFormInputLabel(this.getTitle());
46204620
this.container.appendChild(this.title);
46214621

@@ -4645,6 +4645,8 @@ JSONEditor.defaults.editors.enum = JSONEditor.AbstractEditor.extend({
46454645
this.display_area.style.paddingTop = 0;
46464646
this.display_area.style.paddingBottom = 0;
46474647
this.container.appendChild(this.display_area);
4648+
4649+
if(this.options.hide_display) this.display_area.style.display = "none";
46484650

46494651
this.switcher.addEventListener('change',function() {
46504652
self.selected = self.select_options.indexOf(this.value);

dist/jsoneditor.min.js

+5-5
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.7.7 - JSON Schema -> HTML Editor
1+
/*! JSON Editor v0.7.8 - JSON Schema -> HTML Editor
22
* By Jeremy Dorn - https://github.com/jdorn/json-editor/
33
* Released under the MIT license
44
*
5-
* Date: 2014-08-21
5+
* Date: 2014-08-28
66
*/
77

88
/**

0 commit comments

Comments
 (0)