cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

template variables with spaces are not replaced correctly fixed #129

Browse Source
This commit is contained in:
javi 2014-02-06 17:33:26 +01:00
parent ab7d603171
commit 78f69d5236
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS.md
View File

@ -12,6 +12,10 @@ Enhancements:
* Allow specifying fixed sqlapi host address (#117) * Allow specifying fixed sqlapi host address (#117)
Bug fixes:
* Template variables with spaces are not replaced correctly (#129)
1.6.3 -- 2014-01-30 1.6.3 -- 2014-01-30
------------------- -------------------

2
lib/cartodb/template_maps.js
View File

@ -534,7 +534,7 @@ o._replaceVars = function(str, params) {
if ( ! params._re ) { if ( ! params._re ) {
params._re = {}; params._re = {};
for (var k in params) { for (var k in params) {
params._re[k] = RegExp("<%= " + k + " %>", "g"); params._re[k] = RegExp("<%=\\s*" + k + "\\s*%>", "g");
} }
} }
for (var k in params) str = str.replace(params._re[k], params[k]); for (var k in params) str = str.replace(params._re[k], params[k]);

4
test/unit/cartodb/template_maps.test.js
View File

@ -343,11 +343,11 @@ suite('template_maps', function() {
global_cartocss_version: '2.0.2', global_cartocss_version: '2.0.2',
layers: [ layers: [
{ options: { { options: {
sql: "select '<%= name %>' || id, g from t", sql: "select '<%=name %>' || id, g from t",
cartocss: '#layer { marker-fill:<%= fill %>; }' cartocss: '#layer { marker-fill:<%= fill %>; }'
} }, } },
{ options: { { options: {
sql: "select fun('<%= name %>') g from x", sql: "select fun('<%= name%>') g from x",
cartocss: '#layer { line-color:<%= color %>; marker-fill:<%= color %>; }' cartocss: '#layer { line-color:<%= color %>; marker-fill:<%= color %>; }'
} }, } },
{ options: { { options: {