Released version 5.5.6

This commit is contained in:
jos 2016-06-15 19:35:28 +02:00
parent c2c7dd5adf
commit 91d9bc6903
8 changed files with 18 additions and 11 deletions

View File

@ -3,7 +3,7 @@
https://github.com/josdejong/jsoneditor https://github.com/josdejong/jsoneditor
## not yet released, version 5.5.6 ## 2016-06-15, version 5.5.6
- Fixed #303: editor contents collapsed when the parent div of the JSONEditor - Fixed #303: editor contents collapsed when the parent div of the JSONEditor
has no height set. has no height set.

View File

@ -24,8 +24,8 @@
* Copyright (c) 2011-2016 Jos de Jong, http://jsoneditoronline.org * Copyright (c) 2011-2016 Jos de Jong, http://jsoneditoronline.org
* *
* @author Jos de Jong, <wjosdejong@gmail.com> * @author Jos de Jong, <wjosdejong@gmail.com>
* @version 5.5.5 * @version 5.5.6
* @date 2016-05-24 * @date 2016-06-15
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')

File diff suppressed because one or more lines are too long

7
dist/jsoneditor.css vendored
View File

@ -23,6 +23,8 @@ div.jsoneditor th {
vertical-align: inherit; vertical-align: inherit;
border-radius: inherit; border-radius: inherit;
} }
div.jsoneditor-field, div.jsoneditor-field,
div.jsoneditor-value, div.jsoneditor-value,
div.jsoneditor-readonly { div.jsoneditor-readonly {
@ -226,6 +228,11 @@ div.jsoneditor-outer {
box-sizing: border-box; box-sizing: border-box;
} }
textarea.jsoneditor-text,
.ace-jsoneditor {
min-height: 150px;
}
div.jsoneditor-tree { div.jsoneditor-tree {
width: 100%; width: 100%;
height: 100%; height: 100%;

4
dist/jsoneditor.js vendored
View File

@ -24,8 +24,8 @@
* Copyright (c) 2011-2016 Jos de Jong, http://jsoneditoronline.org * Copyright (c) 2011-2016 Jos de Jong, http://jsoneditoronline.org
* *
* @author Jos de Jong, <wjosdejong@gmail.com> * @author Jos de Jong, <wjosdejong@gmail.com>
* @version 5.5.5 * @version 5.5.6
* @date 2016-05-24 * @date 2016-06-15
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{ {
"name": "jsoneditor", "name": "jsoneditor",
"version": "5.5.5", "version": "5.5.6",
"main": "./index", "main": "./index",
"description": "A web-based tool to view, edit, format, and validate JSON", "description": "A web-based tool to view, edit, format, and validate JSON",
"tags": [ "tags": [