From 8f27c0ab350b91551c86869d19cec60e7443ab37 Mon Sep 17 00:00:00 2001 From: Rafael Casado Sanchez Date: Thu, 23 Jan 2014 17:48:26 +0100 Subject: [PATCH] Updated cartodb.js --- .../javascripts/cartodb.mod.torque.uncompressed.js | 11 +++++++++++ vendor/assets/javascripts/cartodb.uncompressed.js | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/vendor/assets/javascripts/cartodb.mod.torque.uncompressed.js b/vendor/assets/javascripts/cartodb.mod.torque.uncompressed.js index b4b85f617aad..bcf4f30195c6 100644 --- a/vendor/assets/javascripts/cartodb.mod.torque.uncompressed.js +++ b/vendor/assets/javascripts/cartodb.mod.torque.uncompressed.js @@ -3227,6 +3227,10 @@ tree.Dimension.prototype = { return this; }, + round: function() { + this.value = Math.round(this.value); + return this; + }, toColor: function() { return new tree.Color([this.value, this.value, this.value]); }, @@ -4112,6 +4116,13 @@ tree.Reference.validValue = function(env, selector, value) { } } else if (tree.Reference.selector(selector).type == 'expression') { return true; + } else if (tree.Reference.selector(selector).type === 'unsigned') { + if (value.value[0].is === 'float') { + value.value[0].round(); + return true; + } else { + return false; + } } else { if (tree.Reference.selector(selector).validate) { var valid = false; diff --git a/vendor/assets/javascripts/cartodb.uncompressed.js b/vendor/assets/javascripts/cartodb.uncompressed.js index e8373486676d..3a40e9a60f36 100644 --- a/vendor/assets/javascripts/cartodb.uncompressed.js +++ b/vendor/assets/javascripts/cartodb.uncompressed.js @@ -1,6 +1,6 @@ // cartodb.js version: 3.5.06-dev // uncompressed version: cartodb.uncompressed.js -// sha: d9706c372c292359b6cd7d7694c56ff4496b8f23 +// sha: 58c9b557cf1ecfe0785b6ba5b165cf7d581cff94 (function() { var root = this;