Released v5.13.3

This commit is contained in:
jos 2018-02-07 12:17:32 +01:00
parent 4c8c4d4a02
commit c6c592c399
10 changed files with 5038 additions and 23 deletions

View File

@ -24,8 +24,8 @@
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org * Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
* *
* @author Jos de Jong, <wjosdejong@gmail.com> * @author Jos de Jong, <wjosdejong@gmail.com>
* @version 5.13.2 * @version 5.13.3
* @date 2018-01-18 * @date 2018-02-07
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
@ -9139,11 +9139,17 @@ return /******/ (function(modules) { // webpackBootstrap
textarea.onblur = this._onBlur.bind(this); textarea.onblur = this._onBlur.bind(this);
} }
var validationErrorsContainer = document.createElement('div');
validationErrorsContainer.className = 'validation-errors-container';
this.dom.validationErrorsContainer = validationErrorsContainer;
this.frame.appendChild(validationErrorsContainer);
if (options.statusBar) { if (options.statusBar) {
util.addClassName(this.content, 'has-status-bar'); util.addClassName(this.content, 'has-status-bar');
this.curserInfoElements = {}; this.curserInfoElements = {};
var statusBar = document.createElement('div'); var statusBar = document.createElement('div');
this.dom.statusBar = statusBar;
statusBar.className = 'jsoneditor-statusbar'; statusBar.className = 'jsoneditor-statusbar';
this.frame.appendChild(statusBar); this.frame.appendChild(statusBar);
@ -9523,9 +9529,10 @@ return /******/ (function(modules) { // webpackBootstrap
'</table>'; '</table>';
this.dom.validationErrors = validationErrors; this.dom.validationErrors = validationErrors;
this.frame.appendChild(validationErrors); this.dom.validationErrorsContainer.appendChild(validationErrors);
var height = validationErrors.clientHeight; var height = validationErrors.clientHeight +
(this.dom.statusBar ? this.dom.statusBar.clientHeight : 0);
this.content.style.marginBottom = (-height) + 'px'; this.content.style.marginBottom = (-height) + 'px';
this.content.style.paddingBottom = height + 'px'; this.content.style.paddingBottom = height + 'px';
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
dist/jsoneditor.css vendored
View File

@ -1021,7 +1021,7 @@ div.jsoneditor-treepath span.jsoneditor-treepath-seperator:hover {
div.jsoneditor-statusbar { div.jsoneditor-statusbar {
line-height: 26px; line-height: 26px;
height: 26px; height: 26px;
margin-top: -26px; margin-top: -1px;
color: #808080; color: #808080;
background-color: #ebebeb; background-color: #ebebeb;
border-top: 1px solid #d3d3d3; border-top: 1px solid #d3d3d3;

15
dist/jsoneditor.js vendored
View File

@ -24,8 +24,8 @@
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org * Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
* *
* @author Jos de Jong, <wjosdejong@gmail.com> * @author Jos de Jong, <wjosdejong@gmail.com>
* @version 5.13.2 * @version 5.13.3
* @date 2018-01-18 * @date 2018-02-07
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
@ -16685,11 +16685,17 @@ return /******/ (function(modules) { // webpackBootstrap
textarea.onblur = this._onBlur.bind(this); textarea.onblur = this._onBlur.bind(this);
} }
var validationErrorsContainer = document.createElement('div');
validationErrorsContainer.className = 'validation-errors-container';
this.dom.validationErrorsContainer = validationErrorsContainer;
this.frame.appendChild(validationErrorsContainer);
if (options.statusBar) { if (options.statusBar) {
util.addClassName(this.content, 'has-status-bar'); util.addClassName(this.content, 'has-status-bar');
this.curserInfoElements = {}; this.curserInfoElements = {};
var statusBar = document.createElement('div'); var statusBar = document.createElement('div');
this.dom.statusBar = statusBar;
statusBar.className = 'jsoneditor-statusbar'; statusBar.className = 'jsoneditor-statusbar';
this.frame.appendChild(statusBar); this.frame.appendChild(statusBar);
@ -17069,9 +17075,10 @@ return /******/ (function(modules) { // webpackBootstrap
'</table>'; '</table>';
this.dom.validationErrors = validationErrors; this.dom.validationErrors = validationErrors;
this.frame.appendChild(validationErrors); this.dom.validationErrorsContainer.appendChild(validationErrors);
var height = validationErrors.clientHeight; var height = validationErrors.clientHeight +
(this.dom.statusBar ? this.dom.statusBar.clientHeight : 0);
this.content.style.marginBottom = (-height) + 'px'; this.content.style.marginBottom = (-height) + 'px';
this.content.style.paddingBottom = height + 'px'; this.content.style.paddingBottom = height + 'px';
} }

2
dist/jsoneditor.map vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

5001
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "jsoneditor", "name": "jsoneditor",
"version": "5.13.2", "version": "5.13.3",
"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": [