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

updated carto library #21

Browse Source
This commit is contained in:
javi 2013-11-18 17:29:51 +01:00
parent 9247f1b390
commit 9fac885679
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vendor/carto.js vendored
View File

@ -4811,7 +4811,7 @@ tree.Value.prototype.toJS = function() {
//var v = this.value[0].value[0]; //var v = this.value[0].value[0];
var val = this.eval() var val = this.eval()
var v = val.toString(); var v = val.toString();
if(val.is === "color" || val.is === 'uri') { if(val.is === "color" || val.is === 'uri' || val.is === 'string') {
v = "'" + v + "'"; v = "'" + v + "'";
} else if (val.is === 'field') { } else if (val.is === 'field') {
// replace [varuable] by ctx['variable'] // replace [varuable] by ctx['variable']
@ -4996,6 +4996,11 @@ CartoCSS.Layer.prototype = {
return this.fullName().split('::')[1]; 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'... * `target`: style, 'svg', 'canvas-2d'...