Merge pull request josdejong#164 from yanivefraim/develop

Feature josdejong#144
ImpulseHu · Feb 13, 2015 · 1a5ea41 · 1a5ea41
2 parents abc3ac3 + 7bb6b6d
commit 1a5ea41
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/jsoneditor.js b/jsoneditor.js
@@ -24,7 +24,7 @@
  *
  * @author  Jos de Jong, <[email protected]>
  * @version 3.2.0
- * @date    2015-01-25
+ * @date    2015-02-13
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -1481,6 +1481,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	      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;
 	  };
 

diff --git a/jsoneditor.map b/jsoneditor.map
diff --git a/jsoneditor.min.js b/jsoneditor.min.js
diff --git a/src/js/util.js b/src/js/util.js
@@ -71,6 +71,16 @@ define(function () {
       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;
   };