Skip to content

Commit e6d8532

Browse files
authored
Merge pull request #3755 from plotly/select-console-warn-hotfix
Don't try to call doneFnCompleted when it isn't set
2 parents b6a5298 + 9856354 commit e6d8532

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

Diff for: src/plots/cartesian/select.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ var Registry = require('../../registry');
1515
var Color = require('../../components/color');
1616
var Fx = require('../../components/fx');
1717

18+
var Lib = require('../../lib');
1819
var polygon = require('../../lib/polygon');
1920
var throttle = require('../../lib/throttle');
2021
var makeEventData = require('../../components/fx/helpers').makeEventData;
@@ -49,8 +50,6 @@ function prepSelect(e, startX, startY, dragOptions, mode) {
4950
var allAxes = dragOptions.xaxes.concat(dragOptions.yaxes);
5051
var subtract = e.altKey;
5152

52-
var doneFnCompleted = dragOptions.doneFnCompleted;
53-
5453
var filterPoly, selectionTester, mergedPolygons, currentPolygon;
5554
var i, searchInfo, eventData;
5655

@@ -268,7 +267,7 @@ function prepSelect(e, startX, startY, dragOptions, mode) {
268267
}
269268

270269
Fx.click(gd, evt);
271-
});
270+
}).catch(Lib.error);
272271
};
273272

274273
dragOptions.doneFn = function() {
@@ -288,8 +287,10 @@ function prepSelect(e, startX, startY, dragOptions, mode) {
288287
[].push.apply(dragOptions.mergedPolygons, mergedPolygons);
289288
}
290289

291-
doneFnCompleted(selection);
292-
});
290+
if(dragOptions.doneFnCompleted) {
291+
dragOptions.doneFnCompleted(selection);
292+
}
293+
}).catch(Lib.error);
293294
};
294295
}
295296

Diff for: test/jasmine/tests/select_test.js

+2
Original file line numberDiff line numberDiff line change
@@ -1597,6 +1597,7 @@ describe('Test select box and lasso per trace:', function() {
15971597

15981598
beforeEach(function() {
15991599
gd = createGraphDiv();
1600+
spyOn(Lib, 'error');
16001601
});
16011602

16021603
afterEach(destroyGraphDiv);
@@ -1716,6 +1717,7 @@ describe('Test select box and lasso per trace:', function() {
17161717
.then(eventCounts[2] ? deselectPromise : Promise.resolve())
17171718
.then(function() {
17181719
assertEventCounts(eventCounts[0], eventCounts[1], eventCounts[2], msg + ' (after dblclick)');
1720+
expect(Lib.error).not.toHaveBeenCalled();
17191721
});
17201722
}
17211723

0 commit comments

Comments
 (0)