Skip to content

Commit 9125f21

Browse files
authored
Merge pull request #816 from plotly/scattermapbox-in-main-bundle
Include `scattermapbox` in main bundle
2 parents 4e66064 + 4376943 commit 9125f21

10 files changed

+6
-18
lines changed

lib/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ Plotly.register([
2525
require('./scattergeo'),
2626
require('./choropleth'),
2727
require('./scattergl'),
28-
require('./scatterternary')
28+
require('./scatterternary'),
29+
require('./scattermapbox')
2930
]);
3031

3132
module.exports = Plotly;

test/image/baselines/mapbox_0.png

-248 Bytes
Loading
-164 Bytes
Loading
1.13 KB
Loading
-212 Bytes
Loading
-215 Bytes
Loading

test/image/compare_pixels_test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ if(mockList.length === 0) {
5555
throw new Error('No mocks found with pattern ' + pattern);
5656
}
5757

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

6464
// main

test/jasmine/tests/mapbox_test.js

-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ var MOUSE_DELAY = 100;
1717

1818
var noop = function() {};
1919

20-
// until it is part of the main plotly.js bundle
21-
Plotly.register(
22-
require('@lib/scattermapbox')
23-
);
24-
2520
Plotly.setPlotConfig({
2621
mapboxAccessToken: MAPBOX_ACCESS_TOKEN
2722
});

test/jasmine/tests/plotschema_test.js

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ var Plotly = require('@lib/index');
22
var Lib = require('@src/lib');
33

44
Plotly.register([
5-
// until it is part of the main plotly.js bundle
6-
require('@lib/scattermapbox'),
7-
85
// until they become official
96
require('../assets/transforms/filter')
107
]);

test/jasmine/tests/scattermapbox_test.js

-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ var destroyGraphDiv = require('../assets/destroy_graph_div');
1010
var hasWebGLSupport = require('../assets/has_webgl_support');
1111
var customMatchers = require('../assets/custom_matchers');
1212

13-
// until it is part of the main plotly.js bundle
14-
Plotly.register(
15-
require('@lib/scattermapbox')
16-
);
17-
1813
Plotly.setPlotConfig({
1914
mapboxAccessToken: require('@build/credentials.json').MAPBOX_ACCESS_TOKEN
2015
});

0 commit comments

Comments
 (0)