Skip to content

Commit 0d79ea9

Browse files
authored
Merge pull request #5239 from jdpaterson/master
Fix hover on mobile and tablet devices for gl3d subplots
2 parents 0fce11b + 95ca0d9 commit 0d79ea9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"gl-mat4": "^1.2.0",
8787
"gl-mesh3d": "^2.3.1",
8888
"gl-plot2d": "^1.4.5",
89-
"gl-plot3d": "^2.4.6",
89+
"gl-plot3d": "^2.4.7",
9090
"gl-pointcloud2d": "^1.0.3",
9191
"gl-scatter3d": "^1.2.3",
9292
"gl-select-box": "^1.0.4",

test/jasmine/tests/gl3d_plot_interact_test.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -941,15 +941,15 @@ describe('Test gl3d drag and wheel interactions', function() {
941941
var sceneTarget;
942942
var relayoutCallback = jasmine.createSpy('relayoutCallback');
943943

944-
function assertEvent(e) {
945-
expect(e.defaultPrevented).toEqual(true);
944+
function assertEvent(e, passive) {
945+
expect(e.defaultPrevented).not.toEqual(passive);
946946
relayoutCallback();
947947
}
948948

949-
gd.addEventListener('touchend', assertEvent);
950-
gd.addEventListener('touchstart', assertEvent);
951-
gd.addEventListener('touchmove', assertEvent);
952-
gd.addEventListener('wheel', assertEvent);
949+
gd.addEventListener('touchend', function(e) { assertEvent(e, true); });
950+
gd.addEventListener('touchstart', function(e) { assertEvent(e, true); });
951+
gd.addEventListener('touchmove', function(e) { assertEvent(e, false); });
952+
gd.addEventListener('wheel', function(e) { assertEvent(e, false); });
953953

954954
Plotly.plot(gd, mock)
955955
.then(function() {

0 commit comments

Comments
 (0)