Merge remote-tracking branch 'origin/develop' into develop

Conflicts: jsoneditor.js jsoneditor.map jsoneditor.min.js src/js/util.js
ImpulseHu · Feb 27, 2015 · 2c9b7e9 · 2c9b7e9
2 parents 629ed49 + 1a5ea41
commit 2c9b7e9
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/js/util.js b/src/js/util.js
@@ -68,6 +68,16 @@ exports.sanitize = function (jsString) {
     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;
 };