Skip to content

Commit 5adb727

Browse files
committed
Mute event listener logging
1 parent 90218e5 commit 5adb727

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/components/dragelement/index.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,12 @@ dragElement.init = function init(options) {
9797
element.style.pointerEvents = 'all';
9898

9999
element.onmousedown = onStart;
100-
element.ontouchstart = onStart;
100+
101+
if(element._ontouchstart) {
102+
element.removeEventListener('touchstart', element._ontouchstart);
103+
}
104+
element._ontouchstart = onStart;
105+
element.addEventListener('touchstart', onStart, {passive: false});
101106

102107
function onStart(e) {
103108
// make dragging and dragged into properties of gd

src/plots/cartesian/dragbox.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,14 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
434434

435435
// everything but the corners gets wheel zoom
436436
if(ns.length * ew.length !== 1) {
437-
// still seems to be some confusion about onwheel vs onmousewheel...
438-
if(dragger.onwheel !== undefined) dragger.onwheel = zoomWheel;
439-
else if(dragger.onmousewheel !== undefined) dragger.onmousewheel = zoomWheel;
437+
var wheelEventName = dragger.onwheel !== undefined ? 'wheel' : 'mousewheel';
438+
439+
if(dragger._onwheel) {
440+
dragger.removeEventListener(wheelEventName, dragger._onwheel);
441+
}
442+
dragger._onwheel = zoomWheel;
443+
444+
dragger.addEventListener(wheelEventName, zoomWheel, {passive: false});
440445
}
441446

442447
// plotDrag: move the plot in response to a drag

0 commit comments

Comments
 (0)