Merge pull request #263 from e2tha-e/parameter-json-parse

better regex for replacing single quotes

Author: Brian Muenzenmeyer

builder/parameter_hunter.js

@@ -40,11 +40,11 @@
 					var rightParen = pMatch.indexOf(')');
 					var paramString = '{' + pMatch.substring(leftParen + 1, rightParen) + '}';
 					//if param keys are wrapped in single quotes, replace with double quotes.
-					var paramStringWellFormed = paramString.replace(/(')([^']+)(')(\s*\:)/gm, '"$2"$4');
+					var paramStringWellFormed = paramString.replace(/(')([^']+)(')(\s*\:)/g, '"$2"$4');
 					//if params keys are not wrapped in any quotes, wrap in double quotes.
-					var paramStringWellFormed = paramStringWellFormed.replace(/([\{|,]\s*)([^\:\s]+)(\s*\:)/gm, '$1"$2"$3');
+					var paramStringWellFormed = paramStringWellFormed.replace(/([\{|,]\s*)([^\s"'\:]+)(\s*\:)/g, '$1"$2"$3');
 					//if param values are wrapped in single quotes, replace with double quotes.
-					var paramStringWellFormed = paramStringWellFormed.replace(/(\:\s*)(')([^']+)(')/gm, '$1"$3"');
+					var paramStringWellFormed = paramStringWellFormed.replace(/(\:\s*)(')([^']+)(')/g, '$1"$3"');
 
 					var paramData = {};
 					var globalData = {};