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

dist files

Browse Source
This commit is contained in:
javi 2013-11-25 16:36:25 +01:00
parent d1c6c9fb82
commit 834985ba81
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/carto.js vendored
View File

@ -4811,11 +4811,11 @@ tree.Value.prototype.toJS = function() {
//var v = this.value[0].value[0];
var val = this.eval()
var v = val.toString();
if(val.is === "color" || val.is === 'uri') {
if(val.is === "color" || val.is === 'uri' || val.is === 'string') {
v = "'" + v + "'";
} else if (val.is === 'field') {
// replace [varuable] by ctx['variable']
v = v.replace(/\[(.*)\]/g, "ctx['\$1']")
v = v.replace(/\[(.*)\]/g, "data['\$1']")
}
return "_value = " + v + ";";
};
@ -4996,6 +4996,11 @@ CartoCSS.Layer.prototype = {
return this.fullName().split('::')[1];
},
eval: function(prop) {
var p = this.shader[prop];
if (!p) return;
return p({}, { zoom: 0, 'frame-offset': 0 });
},
/*
* `target`: style, 'svg', 'canvas-2d'...