Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix safari drag problem #2184

Merged
merged 6 commits into from
Aug 9, 2018
Merged

Fix safari drag problem #2184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e882995
Trigger vis-view click event in vis-model to listen to it in Builder
Aug 8, 2018
6c18c6d
Use custom @carto/zera branch
Aug 8, 2018
9f6f264
Try custom zera branch again
Aug 8, 2018
31b5ea1
Use zera staging version
Aug 8, 2018
b8c932a
Update zera to v1.0.7
Aug 9, 2018
b55f8af
Increase timout for api/v4/source/dataset specs
Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "1.0.7",
"clip-path-polygon": "0.1.12",
"d3-array": "1.2.1",
"d3-format": "1.2.0",
Expand Down
6 changes: 5 additions & 1 deletion src/vis/vis-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
},

Expand Down
11 changes: 11 additions & 0 deletions test/spec/api/v4/source/dataset.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down