Merge pull request #44 from CartoDB/js-ampersand-fix

Fix ampersand escaping on JS values
This commit is contained in:
David M 2017-10-10 18:20:57 +02:00 committed by GitHub
commit bf4c67034a

View File

@ -33,7 +33,7 @@ tree.Value.prototype = {
var val = this.ev(env); var val = this.ev(env);
var v = val.toString(); var v = val.toString();
if(val.is === "color" || val.is === 'uri' || val.is === 'string' || val.is === 'keyword') { if(val.is === "color" || val.is === 'uri' || val.is === 'string' || val.is === 'keyword') {
v = "'" + v + "'"; v = "'" + v.replace(/&/g, '&') + "'";
} else if (Array.isArray(this.value) && this.value.length > 1) { } else if (Array.isArray(this.value) && this.value.length > 1) {
// This covers something like `line-dasharray: 5, 10;` // This covers something like `line-dasharray: 5, 10;`
// where the return _value has more than one element. // where the return _value has more than one element.