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

Merge pull request #164 from yanivefraim/develop 

Feature #144
This commit is contained in:
Jos de Jong 2015-02-13 09:51:58 +00:00
parent abc3ac3625 7bb6b6d223
commit 1a5ea41e77
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jsoneditor.js
View File

@ -24,7 +24,7 @@
* *
* @author Jos de Jong, <wjosdejong@gmail.com> * @author Jos de Jong, <wjosdejong@gmail.com>
* @version 3.2.0 * @version 3.2.0
* @date 2015-01-25 * @date 2015-02-13
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
@ -1481,6 +1481,16 @@ return /******/ (function(modules) { // webpackBootstrap
return $1 + '"' + $2 + '"' + $3; return $1 + '"' + $2 + '"' + $3;
}); });
jsonString = jsonString.replace(/\/\*(.|[\r\n])*?\*\//g,'');//Remove all code comments
//If JSON starts with a function (Carachters/digist/"_-"), remove this function.
//This is usefull for "stripping" JSONP objects to become JSON
//For example: function_12321321 ( [{"a":"b"}] ); => [{"a":"b"}]
var match = jsonString.match(/^\s*[\dA-z_$]+\s*\(([\s\S]*)\)\s*;?\s*$/);
if (match) {
var jsonString = match[1];
}
return jsonString; return jsonString;
}; };

2
jsoneditor.map
View File

File diff suppressed because one or more lines are too long

4
jsoneditor.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
src/js/util.js
View File

@ -71,6 +71,16 @@ define(function () {
return $1 + '"' + $2 + '"' + $3; return $1 + '"' + $2 + '"' + $3;
}); });
jsonString = jsonString.replace(/\/\*(.|[\r\n])*?\*\//g,'');//Remove all code comments
//If JSON starts with a function (Carachters/digist/"_-"), remove this function.
//This is usefull for "stripping" JSONP objects to become JSON
//For example: function_12321321 ( [{"a":"b"}] ); => [{"a":"b"}]
var match = jsonString.match(/^\s*[\dA-z_$]+\s*\(([\s\S]*)\)\s*;?\s*$/);
if (match) {
var jsonString = match[1];
}
return jsonString; return jsonString;
}; };