Re-enable onFocusOnly option for interaction defaults

This commit is contained in:
Andreas Hocevar
2020-06-03 12:29:37 +02:00
parent 346e9fadff
commit 2cac6c4f39
6 changed files with 28 additions and 42 deletions
+2 -15
View File
@@ -4,7 +4,7 @@
import EventType from '../events/EventType.js';
import Interaction, {zoomByDelta} from './Interaction.js';
import {DEVICE_PIXEL_RATIO, FIREFOX} from '../has.js';
import {always, focus} from '../events/condition.js';
import {always} from '../events/condition.js';
import {clamp} from '../math.js';
/**
@@ -146,19 +146,6 @@ class MouseWheelZoom extends Interaction {
this.deltaPerZoom_ = 300;
}
/**
* @private
* @param {import("../MapBrowserEvent").default} mapBrowserEvent Event.
* @return {boolean} Condition passes.
*/
conditionInternal_(mapBrowserEvent) {
let pass = true;
if (mapBrowserEvent.map.getTargetElement().hasAttribute('tabindex')) {
pass = focus(mapBrowserEvent);
}
return pass && this.condition_(mapBrowserEvent);
}
/**
* @private
*/
@@ -179,7 +166,7 @@ class MouseWheelZoom extends Interaction {
* @return {boolean} `false` to stop event propagation.
*/
handleEvent(mapBrowserEvent) {
if (!this.conditionInternal_(mapBrowserEvent)) {
if (!this.condition_(mapBrowserEvent)) {
return true;
}
const type = mapBrowserEvent.type;