Merge branch 'master' of github.com:swagger-api/swagger-ui

fehguy · fehguy · commit 849d3cffb4a2 · 2015-12-18T12:05:52.000-08:00
diff --git a/src/main/javascript/helpers/handlebars.js b/src/main/javascript/helpers/handlebars.js
@@ -32,7 +32,9 @@ Handlebars.registerHelper('renderTextParam', function(param) {
         idAtt = ' id=\'' + param.valueId + '\'';
     }
 
-    defaultValue = defaultValue.replace(/'/g,'&apos;');
+    if (typeof defaultValue === 'string' || defaultValue instanceof String) {
+        defaultValue = defaultValue.replace(/'/g,'&apos;');
+    }
 
     if(isArray) {
         result = '<textarea class=\'body-textarea' + (param.required ? ' required' : '') + '\' name=\'' + param.name + '\'' + idAtt + dataVendorExtensions;

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@ Handlebars.registerHelper('renderTextParam', function(param) {`
`32`	`32`	`idAtt = ' id=\'' + param.valueId + '\'';`
`33`	`33`	`}`
`34`	`34`
`35`		`- defaultValue = defaultValue.replace(/'/g,''');`
	`35`	`+ if (typeof defaultValue === 'string' \|\| defaultValue instanceof String) {`
	`36`	`+ defaultValue = defaultValue.replace(/'/g,''');`
	`37`	`+ }`
`36`	`38`
`37`	`39`	`if(isArray) {`
`38`	`40`	`result = '<textarea class=\'body-textarea' + (param.required ? ' required' : '') + '\' name=\'' + param.name + '\'' + idAtt + dataVendorExtensions;`