feature josdejong#144

9hao · Feb 11, 2015 · e4c5657 · e4c5657
1 parent abc3ac3
commit e4c5657
Show file tree

Hide file tree

Showing 4 changed files with 26 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-10
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -1481,6 +1481,17 @@ return /******/ (function(modules) { // webpackBootstrap
 	      return $1 + '"' + $2 + '"' + $3;
 	    });
 
+	    //Strips only jQuery's JSONP
+	    // if(jsonString.match(/.*jQuery.+?\(/)){
+	    //   var jsonStringTemp = jsonString.replace(/.*jQuery.+?\(/,'');
+	    //   jsonString = jsonStringTemp.replace(/\)(?!.*\));?/g,'');
+	    // }
+
+	    //Clear json's surrounding (for example: 123{"a":"b"}456 => {"a":"b"})
+	    jsonString = jsonString.replace(/[^{]*/,'');//remove all characters before first "{" (match first not '{')
+
+	    jsonString = jsonString.replace(/([^}])(?!.*(\}))/g,'');//remove all characters after last "}" (match first not '}' which does not have following '}')
+
 	    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,17 @@ define(function () {
       return $1 + '"' + $2 + '"' + $3;
     });
 
+    //Strips only jQuery's JSONP
+    // if(jsonString.match(/.*jQuery.+?\(/)){
+    //   var jsonStringTemp = jsonString.replace(/.*jQuery.+?\(/,'');
+    //   jsonString = jsonStringTemp.replace(/\)(?!.*\));?/g,'');
+    // }
+
+    //Clear json's surrounding (for example: 123{"a":"b"}456 => {"a":"b"})
+    jsonString = jsonString.replace(/[^{]*/,'');//remove all characters before first "{" (match first not '{')
+
+    jsonString = jsonString.replace(/([^}])(?!.*(\}))/g,'');//remove all characters after last "}" (match first not '}' which does not have following '}')
+
     return jsonString;
   };