Skip to content

Include scattermapbox in main bundle #816

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.

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

Merged
merged 4 commits into from
Aug 4, 2016
Merged
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
@@ -25,7 +25,8 @@ Plotly.register([
require('./scattergeo'),
require('./choropleth'),
require('./scattergl'),
require('./scatterternary')
require('./scatterternary'),
require('./scattermapbox')
]);

module.exports = Plotly;
Binary file modified test/image/baselines/mapbox_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/mapbox_angles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/mapbox_connectgaps.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/mapbox_custom-style.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/mapbox_layers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions test/image/compare_pixels_test.js
Original file line number Diff line number Diff line change
@@ -55,10 +55,10 @@ if(mockList.length === 0) {
throw new Error('No mocks found with pattern ' + pattern);
}

mockList = mockList.filter(untestableFilter);

if(mockList.length === 0) {
throw new Error('All mocks found with pattern ' + pattern + ' are currently untestable');
// filter out untestable mocks if no pattern is specified
if(!pattern) {
console.log('Filtering out untestable mocks\n');
mockList = mockList.filter(untestableFilter);
}

// main
5 changes: 0 additions & 5 deletions test/jasmine/tests/mapbox_test.js
Original file line number Diff line number Diff line change
@@ -17,11 +17,6 @@ var MOUSE_DELAY = 100;

var noop = function() {};

// until it is part of the main plotly.js bundle
Plotly.register(
require('@lib/scattermapbox')
);

Plotly.setPlotConfig({
mapboxAccessToken: MAPBOX_ACCESS_TOKEN
});
3 changes: 0 additions & 3 deletions test/jasmine/tests/plotschema_test.js
Original file line number Diff line number Diff line change
@@ -2,9 +2,6 @@ var Plotly = require('@lib/index');
var Lib = require('@src/lib');

Plotly.register([
// until it is part of the main plotly.js bundle
require('@lib/scattermapbox'),

// until they become official
require('../assets/transforms/filter')
]);
5 changes: 0 additions & 5 deletions test/jasmine/tests/scattermapbox_test.js
Original file line number Diff line number Diff line change
@@ -10,11 +10,6 @@ var destroyGraphDiv = require('../assets/destroy_graph_div');
var hasWebGLSupport = require('../assets/has_webgl_support');
var customMatchers = require('../assets/custom_matchers');

// until it is part of the main plotly.js bundle
Plotly.register(
require('@lib/scattermapbox')
);

Plotly.setPlotConfig({
mapboxAccessToken: require('@build/credentials.json').MAPBOX_ACCESS_TOKEN
});