More unit tests and a refinement of the regexp to remove JSONP encaps…

…ulation
9hao · Feb 28, 2015 · 75372fa · 75372fa
1 parent b94b87c
commit 75372fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/js/util.js b/src/js/util.js
@@ -35,7 +35,7 @@ exports.sanitize = function (jsString) {
   //If JSON starts with a function (characters/digits/"_-"), remove this function.
   //This is useful for "stripping" JSONP objects to become JSON
   //For example: /* some comment */ function_12321321 ( [{"a":"b"}] ); => [{"a":"b"}]
-  var match = jsString.match(/^(\/\*(.|[\r\n])*?\*\/)?\s*[\da-zA-Z_$]+\s*\(([\s\S]*)\)\s*;?\s*$/);
+  var match = jsString.match(/^\s*(\/\*(.|[\r\n])*?\*\/)?\s*[\da-zA-Z_$]+\s*\(([\s\S]*)\)\s*;?\s*$/);
   if (match) {
     jsString = match[3];
   }

diff --git a/test/util.test.js b/test/util.test.js
@@ -46,6 +46,8 @@ describe('util', function () {
       assert.equal(util.sanitize('/* foo bar */ callback_123 ({})'), '{}');
       assert.equal(util.sanitize('/* foo bar */\ncallback_123({})'), '{}');
       assert.equal(util.sanitize('/* foo bar */ callback_123 (  {}  )'), '  {}  ');
+      assert.equal(util.sanitize('  /* foo bar */   callback_123 ({});  '), '{}');
+      assert.equal(util.sanitize('\n/* foo\nbar */\ncallback_123 ({});\n\n'), '{}');
 
       // non-matching
       assert.equal(util.sanitize('callback abc({});'), 'callback abc({});');