StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Released v5.5.10

This commit is contained in:
jos 2016-11-02 21:03:18 +01:00
parent df12832a6b
commit 4bc339f6fe
8 changed files with 67 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY.md
View File

@ -3,11 +3,12 @@
https://github.com/josdejong/jsoneditor https://github.com/josdejong/jsoneditor
## not yet released, version 5.5.10 ## 2016-11-02, version 5.5.10
- Fixed #85: pressing enter in an input in a form containing a JSONEditor too - Fixed #85: pressing enter in an input in a form containing a JSONEditor too
breaks submitting the form. breaks submitting the form.
## 2016-10-17, version 5.5.9 ## 2016-10-17, version 5.5.9
- Fixed #329: Editor showing duplicate key warnings for keys defined on the - Fixed #329: Editor showing duplicate key warnings for keys defined on the

23
dist/jsoneditor-minimalist.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.9 * @version 5.5.10
* @date 2016-10-17 * @date 2016-11-02
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
@ -1152,6 +1152,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create expand all button // create expand all button
var expandAll = document.createElement('button'); var expandAll = document.createElement('button');
expandAll.type = 'button';
expandAll.className = 'jsoneditor-expand-all'; expandAll.className = 'jsoneditor-expand-all';
expandAll.title = 'Expand all fields'; expandAll.title = 'Expand all fields';
expandAll.onclick = function () { expandAll.onclick = function () {
@ -1161,6 +1162,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create expand all button // create expand all button
var collapseAll = document.createElement('button'); var collapseAll = document.createElement('button');
collapseAll.type = 'button';
collapseAll.title = 'Collapse all fields'; collapseAll.title = 'Collapse all fields';
collapseAll.className = 'jsoneditor-collapse-all'; collapseAll.className = 'jsoneditor-collapse-all';
collapseAll.onclick = function () { collapseAll.onclick = function () {
@ -1172,6 +1174,7 @@ return /******/ (function(modules) { // webpackBootstrap
if (this.history) { if (this.history) {
// create undo button // create undo button
var undo = document.createElement('button'); var undo = document.createElement('button');
undo.type = 'button';
undo.className = 'jsoneditor-undo jsoneditor-separator'; undo.className = 'jsoneditor-undo jsoneditor-separator';
undo.title = 'Undo last action (Ctrl+Z)'; undo.title = 'Undo last action (Ctrl+Z)';
undo.onclick = function () { undo.onclick = function () {
@ -1182,6 +1185,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create redo button // create redo button
var redo = document.createElement('button'); var redo = document.createElement('button');
redo.type = 'button';
redo.className = 'jsoneditor-redo'; redo.className = 'jsoneditor-redo';
redo.title = 'Redo (Ctrl+Shift+Z)'; redo.title = 'Redo (Ctrl+Shift+Z)';
redo.onclick = function () { redo.onclick = function () {
@ -3300,12 +3304,14 @@ return /******/ (function(modules) { // webpackBootstrap
tbodySearch.appendChild(tr); tbodySearch.appendChild(tr);
var refreshSearch = document.createElement('button'); var refreshSearch = document.createElement('button');
refreshSearch.type = 'button';
refreshSearch.className = 'jsoneditor-refresh'; refreshSearch.className = 'jsoneditor-refresh';
td = document.createElement('td'); td = document.createElement('td');
td.appendChild(refreshSearch); td.appendChild(refreshSearch);
tr.appendChild(td); tr.appendChild(td);
var search = document.createElement('input'); var search = document.createElement('input');
// search.type = 'button';
this.dom.search = search; this.dom.search = search;
search.oninput = function (event) { search.oninput = function (event) {
searchBox._onDelayedSearch(event); searchBox._onDelayedSearch(event);
@ -3329,6 +3335,7 @@ return /******/ (function(modules) { // webpackBootstrap
tr.appendChild(td); tr.appendChild(td);
var searchNext = document.createElement('button'); var searchNext = document.createElement('button');
searchNext.type = 'button';
searchNext.title = 'Next result (Enter)'; searchNext.title = 'Next result (Enter)';
searchNext.className = 'jsoneditor-next'; searchNext.className = 'jsoneditor-next';
searchNext.onclick = function () { searchNext.onclick = function () {
@ -3339,6 +3346,7 @@ return /******/ (function(modules) { // webpackBootstrap
tr.appendChild(td); tr.appendChild(td);
var searchPrevious = document.createElement('button'); var searchPrevious = document.createElement('button');
searchPrevious.type = 'button';
searchPrevious.title = 'Previous result (Shift+Enter)'; searchPrevious.title = 'Previous result (Shift+Enter)';
searchPrevious.className = 'jsoneditor-previous'; searchPrevious.className = 'jsoneditor-previous';
searchPrevious.onclick = function () { searchPrevious.onclick = function () {
@ -3608,6 +3616,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create a (non-visible) button to set the focus to the menu // create a (non-visible) button to set the focus to the menu
var focusButton = document.createElement('button'); var focusButton = document.createElement('button');
focusButton.type = 'button';
dom.focusButton = focusButton; dom.focusButton = focusButton;
var li = document.createElement('li'); var li = document.createElement('li');
li.style.overflow = 'hidden'; li.style.overflow = 'hidden';
@ -3634,6 +3643,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create a button in the menu item // create a button in the menu item
var button = document.createElement('button'); var button = document.createElement('button');
button.type = 'button';
button.className = item.className; button.className = item.className;
domItem.button = button; domItem.button = button;
if (item.title) { if (item.title) {
@ -3662,6 +3672,7 @@ return /******/ (function(modules) { // webpackBootstrap
button.className += ' jsoneditor-default'; button.className += ' jsoneditor-default';
var buttonExpand = document.createElement('button'); var buttonExpand = document.createElement('button');
buttonExpand.type = 'button';
domItem.buttonExpand = buttonExpand; domItem.buttonExpand = buttonExpand;
buttonExpand.className = 'jsoneditor-expand'; buttonExpand.className = 'jsoneditor-expand';
buttonExpand.innerHTML = '<div class="jsoneditor-expand"></div>'; buttonExpand.innerHTML = '<div class="jsoneditor-expand"></div>';
@ -4193,6 +4204,7 @@ return /******/ (function(modules) { // webpackBootstrap
popover.appendChild(document.createTextNode(error.message)); popover.appendChild(document.createTextNode(error.message));
var button = document.createElement('button'); var button = document.createElement('button');
button.type = 'button';
button.className = 'jsoneditor-schema-error'; button.className = 'jsoneditor-schema-error';
button.appendChild(popover); button.appendChild(popover);
@ -5514,6 +5526,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create draggable area // create draggable area
if (this.parent) { if (this.parent) {
var domDrag = document.createElement('button'); var domDrag = document.createElement('button');
domDrag.type = 'button';
dom.drag = domDrag; dom.drag = domDrag;
domDrag.className = 'jsoneditor-dragarea'; domDrag.className = 'jsoneditor-dragarea';
domDrag.title = 'Drag to move this field (Alt+Shift+Arrows)'; domDrag.title = 'Drag to move this field (Alt+Shift+Arrows)';
@ -5525,6 +5538,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create context menu // create context menu
var tdMenu = document.createElement('td'); var tdMenu = document.createElement('td');
var menu = document.createElement('button'); var menu = document.createElement('button');
menu.type = 'button';
dom.menu = menu; dom.menu = menu;
menu.className = 'jsoneditor-contextmenu'; menu.className = 'jsoneditor-contextmenu';
menu.title = 'Click to open the actions menu (Ctrl+M)'; menu.title = 'Click to open the actions menu (Ctrl+M)';
@ -6152,6 +6166,7 @@ return /******/ (function(modules) { // webpackBootstrap
Node.prototype._createDomExpandButton = function () { Node.prototype._createDomExpandButton = function () {
// create expand button // create expand button
var expand = document.createElement('button'); var expand = document.createElement('button');
expand.type = 'button';
if (this._hasChilds()) { if (this._hasChilds()) {
expand.className = this.expanded ? 'jsoneditor-expanded' : 'jsoneditor-collapsed'; expand.className = this.expanded ? 'jsoneditor-expanded' : 'jsoneditor-collapsed';
expand.title = expand.title =
@ -7664,6 +7679,7 @@ return /******/ (function(modules) { // webpackBootstrap
var tdMenu = document.createElement('td'); var tdMenu = document.createElement('td');
dom.tdMenu = tdMenu; dom.tdMenu = tdMenu;
var menu = document.createElement('button'); var menu = document.createElement('button');
menu.type = 'button';
menu.className = 'jsoneditor-contextmenu'; menu.className = 'jsoneditor-contextmenu';
menu.title = 'Click to open the actions menu (Ctrl+M)'; menu.title = 'Click to open the actions menu (Ctrl+M)';
dom.menu = menu; dom.menu = menu;
@ -7918,6 +7934,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create the html element // create the html element
var box = document.createElement('button'); var box = document.createElement('button');
box.type = 'button';
box.className = 'jsoneditor-modes jsoneditor-separator'; box.className = 'jsoneditor-modes jsoneditor-separator';
box.innerHTML = currentTitle + ' &#x25BE;'; box.innerHTML = currentTitle + ' &#x25BE;';
box.title = 'Switch editor mode'; box.title = 'Switch editor mode';
@ -8061,6 +8078,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create format button // create format button
var buttonFormat = document.createElement('button'); var buttonFormat = document.createElement('button');
buttonFormat.type = 'button';
buttonFormat.className = 'jsoneditor-format'; buttonFormat.className = 'jsoneditor-format';
buttonFormat.title = 'Format JSON data, with proper indentation and line feeds (Ctrl+\\)'; buttonFormat.title = 'Format JSON data, with proper indentation and line feeds (Ctrl+\\)';
this.menu.appendChild(buttonFormat); this.menu.appendChild(buttonFormat);
@ -8076,6 +8094,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create compact button // create compact button
var buttonCompact = document.createElement('button'); var buttonCompact = document.createElement('button');
buttonCompact.type = 'button';
buttonCompact.className = 'jsoneditor-compact'; buttonCompact.className = 'jsoneditor-compact';
buttonCompact.title = 'Compact JSON data, remove all whitespaces (Ctrl+Shift+\\)'; buttonCompact.title = 'Compact JSON data, remove all whitespaces (Ctrl+Shift+\\)';
this.menu.appendChild(buttonCompact); this.menu.appendChild(buttonCompact);

2
dist/jsoneditor-minimalist.map vendored
View File

File diff suppressed because one or more lines are too long

12
dist/jsoneditor-minimalist.min.js vendored
View File

File diff suppressed because one or more lines are too long

23
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.9 * @version 5.5.10
* @date 2016-10-17 * @date 2016-11-02
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
@ -9051,6 +9051,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create expand all button // create expand all button
var expandAll = document.createElement('button'); var expandAll = document.createElement('button');
expandAll.type = 'button';
expandAll.className = 'jsoneditor-expand-all'; expandAll.className = 'jsoneditor-expand-all';
expandAll.title = 'Expand all fields'; expandAll.title = 'Expand all fields';
expandAll.onclick = function () { expandAll.onclick = function () {
@ -9060,6 +9061,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create expand all button // create expand all button
var collapseAll = document.createElement('button'); var collapseAll = document.createElement('button');
collapseAll.type = 'button';
collapseAll.title = 'Collapse all fields'; collapseAll.title = 'Collapse all fields';
collapseAll.className = 'jsoneditor-collapse-all'; collapseAll.className = 'jsoneditor-collapse-all';
collapseAll.onclick = function () { collapseAll.onclick = function () {
@ -9071,6 +9073,7 @@ return /******/ (function(modules) { // webpackBootstrap
if (this.history) { if (this.history) {
// create undo button // create undo button
var undo = document.createElement('button'); var undo = document.createElement('button');
undo.type = 'button';
undo.className = 'jsoneditor-undo jsoneditor-separator'; undo.className = 'jsoneditor-undo jsoneditor-separator';
undo.title = 'Undo last action (Ctrl+Z)'; undo.title = 'Undo last action (Ctrl+Z)';
undo.onclick = function () { undo.onclick = function () {
@ -9081,6 +9084,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create redo button // create redo button
var redo = document.createElement('button'); var redo = document.createElement('button');
redo.type = 'button';
redo.className = 'jsoneditor-redo'; redo.className = 'jsoneditor-redo';
redo.title = 'Redo (Ctrl+Shift+Z)'; redo.title = 'Redo (Ctrl+Shift+Z)';
redo.onclick = function () { redo.onclick = function () {
@ -11199,12 +11203,14 @@ return /******/ (function(modules) { // webpackBootstrap
tbodySearch.appendChild(tr); tbodySearch.appendChild(tr);
var refreshSearch = document.createElement('button'); var refreshSearch = document.createElement('button');
refreshSearch.type = 'button';
refreshSearch.className = 'jsoneditor-refresh'; refreshSearch.className = 'jsoneditor-refresh';
td = document.createElement('td'); td = document.createElement('td');
td.appendChild(refreshSearch); td.appendChild(refreshSearch);
tr.appendChild(td); tr.appendChild(td);
var search = document.createElement('input'); var search = document.createElement('input');
// search.type = 'button';
this.dom.search = search; this.dom.search = search;
search.oninput = function (event) { search.oninput = function (event) {
searchBox._onDelayedSearch(event); searchBox._onDelayedSearch(event);
@ -11228,6 +11234,7 @@ return /******/ (function(modules) { // webpackBootstrap
tr.appendChild(td); tr.appendChild(td);
var searchNext = document.createElement('button'); var searchNext = document.createElement('button');
searchNext.type = 'button';
searchNext.title = 'Next result (Enter)'; searchNext.title = 'Next result (Enter)';
searchNext.className = 'jsoneditor-next'; searchNext.className = 'jsoneditor-next';
searchNext.onclick = function () { searchNext.onclick = function () {
@ -11238,6 +11245,7 @@ return /******/ (function(modules) { // webpackBootstrap
tr.appendChild(td); tr.appendChild(td);
var searchPrevious = document.createElement('button'); var searchPrevious = document.createElement('button');
searchPrevious.type = 'button';
searchPrevious.title = 'Previous result (Shift+Enter)'; searchPrevious.title = 'Previous result (Shift+Enter)';
searchPrevious.className = 'jsoneditor-previous'; searchPrevious.className = 'jsoneditor-previous';
searchPrevious.onclick = function () { searchPrevious.onclick = function () {
@ -11507,6 +11515,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create a (non-visible) button to set the focus to the menu // create a (non-visible) button to set the focus to the menu
var focusButton = document.createElement('button'); var focusButton = document.createElement('button');
focusButton.type = 'button';
dom.focusButton = focusButton; dom.focusButton = focusButton;
var li = document.createElement('li'); var li = document.createElement('li');
li.style.overflow = 'hidden'; li.style.overflow = 'hidden';
@ -11533,6 +11542,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create a button in the menu item // create a button in the menu item
var button = document.createElement('button'); var button = document.createElement('button');
button.type = 'button';
button.className = item.className; button.className = item.className;
domItem.button = button; domItem.button = button;
if (item.title) { if (item.title) {
@ -11561,6 +11571,7 @@ return /******/ (function(modules) { // webpackBootstrap
button.className += ' jsoneditor-default'; button.className += ' jsoneditor-default';
var buttonExpand = document.createElement('button'); var buttonExpand = document.createElement('button');
buttonExpand.type = 'button';
domItem.buttonExpand = buttonExpand; domItem.buttonExpand = buttonExpand;
buttonExpand.className = 'jsoneditor-expand'; buttonExpand.className = 'jsoneditor-expand';
buttonExpand.innerHTML = '<div class="jsoneditor-expand"></div>'; buttonExpand.innerHTML = '<div class="jsoneditor-expand"></div>';
@ -12092,6 +12103,7 @@ return /******/ (function(modules) { // webpackBootstrap
popover.appendChild(document.createTextNode(error.message)); popover.appendChild(document.createTextNode(error.message));
var button = document.createElement('button'); var button = document.createElement('button');
button.type = 'button';
button.className = 'jsoneditor-schema-error'; button.className = 'jsoneditor-schema-error';
button.appendChild(popover); button.appendChild(popover);
@ -13413,6 +13425,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create draggable area // create draggable area
if (this.parent) { if (this.parent) {
var domDrag = document.createElement('button'); var domDrag = document.createElement('button');
domDrag.type = 'button';
dom.drag = domDrag; dom.drag = domDrag;
domDrag.className = 'jsoneditor-dragarea'; domDrag.className = 'jsoneditor-dragarea';
domDrag.title = 'Drag to move this field (Alt+Shift+Arrows)'; domDrag.title = 'Drag to move this field (Alt+Shift+Arrows)';
@ -13424,6 +13437,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create context menu // create context menu
var tdMenu = document.createElement('td'); var tdMenu = document.createElement('td');
var menu = document.createElement('button'); var menu = document.createElement('button');
menu.type = 'button';
dom.menu = menu; dom.menu = menu;
menu.className = 'jsoneditor-contextmenu'; menu.className = 'jsoneditor-contextmenu';
menu.title = 'Click to open the actions menu (Ctrl+M)'; menu.title = 'Click to open the actions menu (Ctrl+M)';
@ -14051,6 +14065,7 @@ return /******/ (function(modules) { // webpackBootstrap
Node.prototype._createDomExpandButton = function () { Node.prototype._createDomExpandButton = function () {
// create expand button // create expand button
var expand = document.createElement('button'); var expand = document.createElement('button');
expand.type = 'button';
if (this._hasChilds()) { if (this._hasChilds()) {
expand.className = this.expanded ? 'jsoneditor-expanded' : 'jsoneditor-collapsed'; expand.className = this.expanded ? 'jsoneditor-expanded' : 'jsoneditor-collapsed';
expand.title = expand.title =
@ -15563,6 +15578,7 @@ return /******/ (function(modules) { // webpackBootstrap
var tdMenu = document.createElement('td'); var tdMenu = document.createElement('td');
dom.tdMenu = tdMenu; dom.tdMenu = tdMenu;
var menu = document.createElement('button'); var menu = document.createElement('button');
menu.type = 'button';
menu.className = 'jsoneditor-contextmenu'; menu.className = 'jsoneditor-contextmenu';
menu.title = 'Click to open the actions menu (Ctrl+M)'; menu.title = 'Click to open the actions menu (Ctrl+M)';
dom.menu = menu; dom.menu = menu;
@ -15817,6 +15833,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create the html element // create the html element
var box = document.createElement('button'); var box = document.createElement('button');
box.type = 'button';
box.className = 'jsoneditor-modes jsoneditor-separator'; box.className = 'jsoneditor-modes jsoneditor-separator';
box.innerHTML = currentTitle + ' &#x25BE;'; box.innerHTML = currentTitle + ' &#x25BE;';
box.title = 'Switch editor mode'; box.title = 'Switch editor mode';
@ -15960,6 +15977,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create format button // create format button
var buttonFormat = document.createElement('button'); var buttonFormat = document.createElement('button');
buttonFormat.type = 'button';
buttonFormat.className = 'jsoneditor-format'; buttonFormat.className = 'jsoneditor-format';
buttonFormat.title = 'Format JSON data, with proper indentation and line feeds (Ctrl+\\)'; buttonFormat.title = 'Format JSON data, with proper indentation and line feeds (Ctrl+\\)';
this.menu.appendChild(buttonFormat); this.menu.appendChild(buttonFormat);
@ -15975,6 +15993,7 @@ return /******/ (function(modules) { // webpackBootstrap
// create compact button // create compact button
var buttonCompact = document.createElement('button'); var buttonCompact = document.createElement('button');
buttonCompact.type = 'button';
buttonCompact.className = 'jsoneditor-compact'; buttonCompact.className = 'jsoneditor-compact';
buttonCompact.title = 'Compact JSON data, remove all whitespaces (Ctrl+Shift+\\)'; buttonCompact.title = 'Compact JSON data, remove all whitespaces (Ctrl+Shift+\\)';
this.menu.appendChild(buttonCompact); this.menu.appendChild(buttonCompact);

2
dist/jsoneditor.map vendored
View File

File diff suppressed because one or more lines are too long

28
dist/jsoneditor.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

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