From fc050fbd37c4e8c01ba557d651f0418baf79abba Mon Sep 17 00:00:00 2001 From: javi Date: Thu, 9 Apr 2015 11:02:04 +0200 Subject: [PATCH] fixed interaction with there are hidden layers, fixes #3090 --- NEWS.md | 3 +++ lib/assets/javascripts/cdb | 2 +- package.json | 2 +- vendor/assets/javascripts/cartodb.uncompressed.js | 8 ++++---- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/NEWS.md b/NEWS.md index f724145e056c..45d47f491e89 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +3.10.1 () +* fixed interaction when there are hidden layers #3090 + 3.10.0 (2015-04-08) ------------------- * Internal code refactor to allow to disable subdomain-based general application behaviour, to rely instead on URIs like 'domain.com/u/USER/...', or allow to have both systems working at the same time (subdomainless and with subdomain) diff --git a/lib/assets/javascripts/cdb b/lib/assets/javascripts/cdb index c7b47c5cae9a..a89883013ddb 160000 --- a/lib/assets/javascripts/cdb +++ b/lib/assets/javascripts/cdb @@ -1 +1 @@ -Subproject commit c7b47c5cae9ae4722b62cc38d0a2f60117a4d40e +Subproject commit a89883013ddbe27335df75b08815533cd42112f9 diff --git a/package.json b/package.json index a26295918136..b52145eaa743 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "3.9.0", + "version": "3.9.1", "description": "CartoDB UI frontend", "repository": { "type": "git", diff --git a/vendor/assets/javascripts/cartodb.uncompressed.js b/vendor/assets/javascripts/cartodb.uncompressed.js index 7208548061d6..17f7cb9d8df1 100644 --- a/vendor/assets/javascripts/cartodb.uncompressed.js +++ b/vendor/assets/javascripts/cartodb.uncompressed.js @@ -1,6 +1,6 @@ // cartodb.js version: 3.14.0 // uncompressed version: cartodb.uncompressed.js -// sha: c7b47c5cae9ae4722b62cc38d0a2f60117a4d40e +// sha: a89883013ddbe27335df75b08815533cd42112f9 (function() { var root = this; @@ -25652,7 +25652,7 @@ if (typeof window !== 'undefined') { var cdb = root.cdb = {}; - cdb.VERSION = "3.13.2"; + cdb.VERSION = "3.14.0"; cdb.DEBUG = false; cdb.CARTOCSS_VERSIONS = { @@ -33478,7 +33478,7 @@ LayerDefinition.prototype = _.extend({}, Map.prototype, { return n; } layer_def.options.interactivity = this._cleanInteractivity(layer.options.interactivity); - var infowindow = this.getInfowindowData(i); + var infowindow = this.getInfowindowData(this.getLayerNumberByIndex(i)); var attrs = layer.options.attributes ? this._cleanInteractivity(this.options.attributes):(infowindow && fields(infowindow.fields)); if (attrs) { layer_def.options.attributes = { @@ -33612,7 +33612,7 @@ LayerDefinition.prototype = _.extend({}, Map.prototype, { //'v1', Map.BASE_URL.slice(1), this.layerToken, - layer, + this.getLayerIndexByNumber(layer), 'attributes', feature_id].join('/');