From e882995552d9dd617d3eb4cde0aa08ce859fbecf Mon Sep 17 00:00:00 2001 From: rubenmoya Date: Wed, 8 Aug 2018 09:59:52 +0200 Subject: [PATCH 1/6] Trigger vis-view click event in vis-model to listen to it in Builder --- src/vis/vis-view.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vis/vis-view.js b/src/vis/vis-view.js index dddc4a2436..4bddee44ee 100644 --- a/src/vis/vis-view.js +++ b/src/vis/vis-view.js @@ -51,7 +51,11 @@ var Vis = View.extend({ this.$el.html(this.mapView.el); // Bind events before the view is rendered and layer views are added to the map - this.mapView.bind('newLayerView', this._bindLayerViewToLoader, this); + this.listenTo(this.mapView, 'newLayerView', this._bindLayerViewToLoader); + // Trigger click event in map model + this.listenTo(this.mapView, 'click', function () { + this.model.trigger('click'); + }); this.mapView.render(); }, From 6c18c6dc945613913ff6625deee43c78b87eac57 Mon Sep 17 00:00:00 2001 From: rubenmoya Date: Wed, 8 Aug 2018 10:00:33 +0200 Subject: [PATCH 2/6] Use custom @carto/zera branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cd71ee8349..97a20ec7a6 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "browserify-shim": "3.8.12", "camshaft-reference": "0.34.0", "carto": "cartodb/carto#master", - "@carto/zera": "1.0.6", + "@carto/zera": "cartodb/zera#fix-drag-safari", "clip-path-polygon": "0.1.12", "d3-array": "1.2.1", "d3-format": "1.2.0", From 9f6f2644547bb2b763f4dcdb87038385583a5db7 Mon Sep 17 00:00:00 2001 From: rubenmoya Date: Wed, 8 Aug 2018 10:13:10 +0200 Subject: [PATCH 3/6] Try custom zera branch again --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97a20ec7a6..72ce3a0f6c 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "browserify-shim": "3.8.12", "camshaft-reference": "0.34.0", "carto": "cartodb/carto#master", - "@carto/zera": "cartodb/zera#fix-drag-safari", + "@carto/zera": "CartoDB/zera#fix-drag-safari", "clip-path-polygon": "0.1.12", "d3-array": "1.2.1", "d3-format": "1.2.0", From 31b5ea1a11fd2249ec57360a2aeb184bb463b4af Mon Sep 17 00:00:00 2001 From: rubenmoya Date: Wed, 8 Aug 2018 12:21:54 +0200 Subject: [PATCH 4/6] Use zera staging version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72ce3a0f6c..6d214f9505 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "browserify-shim": "3.8.12", "camshaft-reference": "0.34.0", "carto": "cartodb/carto#master", - "@carto/zera": "CartoDB/zera#fix-drag-safari", + "@carto/zera": "1.0.6-staging.2", "clip-path-polygon": "0.1.12", "d3-array": "1.2.1", "d3-format": "1.2.0", From b8c932a4772fc06728cc94c65aae30c62518ab02 Mon Sep 17 00:00:00 2001 From: rubenmoya Date: Thu, 9 Aug 2018 09:33:12 +0200 Subject: [PATCH 5/6] Update zera to v1.0.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d214f9505..b05ecbab9b 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "browserify-shim": "3.8.12", "camshaft-reference": "0.34.0", "carto": "cartodb/carto#master", - "@carto/zera": "1.0.6-staging.2", + "@carto/zera": "1.0.7", "clip-path-polygon": "0.1.12", "d3-array": "1.2.1", "d3-format": "1.2.0", From b55f8af95650f9069cb44a066a820bcf554105ad Mon Sep 17 00:00:00 2001 From: rubenmoya Date: Thu, 9 Aug 2018 10:18:16 +0200 Subject: [PATCH 6/6] Increase timout for api/v4/source/dataset specs --- test/spec/api/v4/source/dataset.spec.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/spec/api/v4/source/dataset.spec.js b/test/spec/api/v4/source/dataset.spec.js index c58728f9f5..0457671665 100644 --- a/test/spec/api/v4/source/dataset.spec.js +++ b/test/spec/api/v4/source/dataset.spec.js @@ -2,6 +2,17 @@ const Base = require('../../../../../src/api/v4/source/base'); const carto = require('../../../../../src/api/v4'); describe('api/v4/source/dataset', function () { + var originalTimeout; + + beforeEach(function () { + originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL; + jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; + }); + + afterEach(function () { + jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout; + }); + describe('constructor', function () { it('should return a new Dataset object', function () { var populatedPlacesDataset = new carto.source.Dataset('ne_10m_populated_places_simple');