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

Publish v5.26.3

This commit is contained in:
jos 2018-12-06 21:44:37 +01:00
parent 6551701153
commit 72ab51002c
11 changed files with 67 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY.md
View File

@ -3,7 +3,7 @@
https://github.com/josdejong/jsoneditor
## not yet released, version 5.26.3
## 2018-12-06, version 5.26.3
- Fixed #610: JSON Repair now removes trailing commas.
- Upgraded devDependency `gulp` to v4. Thanks @maestr0.

2
NOTICE
View File

@ -1,7 +1,7 @@
JSON Editor
https://github.com/josdejong/jsoneditor
Copyright (C) 2011-2017 Jos de Jong
Copyright (C) 2011-2018 Jos de Jong
Licensed under the Apache License, Version 2.0 (the "License");

28
dist/jsoneditor-minimalist.js vendored
View File

@ -21,11 +21,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
* Copyright (c) 2011-2018 Jos de Jong, http://jsoneditoronline.org
*
* @author Jos de Jong, <wjosdejong@gmail.com>
* @version 5.26.2
* @date 2018-11-13
* @version 5.26.3
* @date 2018-12-06
*/
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
@ -4658,13 +4658,17 @@ return /******/ (function(modules) { // webpackBootstrap
function next() { return jsString.charAt(i + 1); }
function prev() { return jsString.charAt(i - 1); }
function isWhiteSpace(c) {
return c === ' ' || c === '\n' || c === '\r' || c === '\t';
}
// get the last parsed non-whitespace character
function lastNonWhitespace () {
var p = chars.length - 1;
while (p >= 0) {
var pp = chars[p];
if (pp !== ' ' && pp !== '\n' && pp !== '\r' && pp !== '\t') { // non whitespace
if (!isWhiteSpace(pp)) {
return pp;
}
p--;
@ -4673,6 +4677,16 @@ return /******/ (function(modules) { // webpackBootstrap
return '';
}
// get at the first next non-white space character
function nextNonWhiteSpace() {
var iNext = i + 1;
while (iNext < jsString.length && isWhiteSpace(jsString[iNext])) {
iNext++;
}
return jsString[iNext];
}
// skip a block comment '/* ... */'
function skipBlockComment () {
i += 2;
@ -4759,7 +4773,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
else if (c === '\u00A0' || (c >= '\u2000' && c <= '\u200A') || c === '\u202F' || c === '\u205F' || c === '\u3000') {
// special white spaces (like non breaking space)
chars.push(' ')
chars.push(' ');
i++
}
else if (c === quote) {
@ -4777,6 +4791,10 @@ return /******/ (function(modules) { // webpackBootstrap
else if (c === quoteDblLeft) {
parseString(quoteDblRight);
}
else if (c === ',' && [']', '}'].indexOf(nextNonWhiteSpace()) !== -1) {
// skip trailing commas
i++;
}
else if (/[a-zA-Z_$]/.test(c) && ['{', ','].indexOf(lastNonWhitespace()) !== -1) {
// an unquoted object key (like a in '{a:2}')
parseKey();

2
dist/jsoneditor-minimalist.map vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

28
dist/jsoneditor.js vendored
View File

@ -21,11 +21,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
* Copyright (c) 2011-2018 Jos de Jong, http://jsoneditoronline.org
*
* @author Jos de Jong, <wjosdejong@gmail.com>
* @version 5.26.2
* @date 2018-11-13
* @version 5.26.3
* @date 2018-12-06
*/
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
@ -33300,13 +33300,17 @@ return /******/ (function(modules) { // webpackBootstrap
function next() { return jsString.charAt(i + 1); }
function prev() { return jsString.charAt(i - 1); }
function isWhiteSpace(c) {
return c === ' ' || c === '\n' || c === '\r' || c === '\t';
}
// get the last parsed non-whitespace character
function lastNonWhitespace () {
var p = chars.length - 1;
while (p >= 0) {
var pp = chars[p];
if (pp !== ' ' && pp !== '\n' && pp !== '\r' && pp !== '\t') { // non whitespace
if (!isWhiteSpace(pp)) {
return pp;
}
p--;
@ -33315,6 +33319,16 @@ return /******/ (function(modules) { // webpackBootstrap
return '';
}
// get at the first next non-white space character
function nextNonWhiteSpace() {
var iNext = i + 1;
while (iNext < jsString.length && isWhiteSpace(jsString[iNext])) {
iNext++;
}
return jsString[iNext];
}
// skip a block comment '/* ... */'
function skipBlockComment () {
i += 2;
@ -33401,7 +33415,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
else if (c === '\u00A0' || (c >= '\u2000' && c <= '\u200A') || c === '\u202F' || c === '\u205F' || c === '\u3000') {
// special white spaces (like non breaking space)
chars.push(' ')
chars.push(' ');
i++
}
else if (c === quote) {
@ -33419,6 +33433,10 @@ return /******/ (function(modules) { // webpackBootstrap
else if (c === quoteDblLeft) {
parseString(quoteDblRight);
}
else if (c === ',' && [']', '}'].indexOf(nextNonWhiteSpace()) !== -1) {
// skip trailing commas
i++;
}
else if (/[a-zA-Z_$]/.test(c) && ['{', ','].indexOf(lastNonWhitespace()) !== -1) {
// an unquoted object key (like a in '{a:2}')
parseKey();

2
dist/jsoneditor.map vendored
View File

File diff suppressed because one or more lines are too long

14
dist/jsoneditor.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "jsoneditor",
"version": "5.26.2",
"version": "5.26.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View File

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

2
src/js/header.js
View File

@ -21,7 +21,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
* Copyright (c) 2011-2018 Jos de Jong, http://jsoneditoronline.org
*
* @author Jos de Jong, <wjosdejong@gmail.com>
* @version @@version