diff --git a/src/ol/events/condition.js b/src/ol/events/condition.js index 624cdf2e7c..f6551ac0fd 100644 --- a/src/ol/events/condition.js +++ b/src/ol/events/condition.js @@ -14,11 +14,11 @@ import {assert} from '../asserts.js'; */ /** - * Creates a condition function that is only fulfilled when a chain of conditions pass. + * Creates a condition function that passes when all provided conditions pass. * @param {...Condition} var_args Conditions to check. - * @return {Condition} Condition function that checks a chain of conditions. + * @return {Condition} Condition function. */ -export function chain(var_args) { +export function all(var_args) { const conditions = arguments; /** * @param {import("../MapBrowserEvent.js").default} event Event. diff --git a/src/ol/interaction/DragPan.js b/src/ol/interaction/DragPan.js index 432f271f8a..e4a7d78efc 100644 --- a/src/ol/interaction/DragPan.js +++ b/src/ol/interaction/DragPan.js @@ -6,7 +6,7 @@ import PointerInteraction, { } from './Pointer.js'; import {FALSE} from '../functions.js'; import { - chain, + all, focusWithTabindex, noModifierKeys, primaryAction, @@ -66,14 +66,14 @@ class DragPan extends PointerInteraction { const condition = options.condition ? options.condition - : chain(noModifierKeys, primaryAction); + : all(noModifierKeys, primaryAction); /** * @private * @type {import("../events/condition.js").Condition} */ this.condition_ = options.onFocusOnly - ? chain(focusWithTabindex, condition) + ? all(focusWithTabindex, condition) : condition; /** diff --git a/src/ol/interaction/MouseWheelZoom.js b/src/ol/interaction/MouseWheelZoom.js index 4f23429cdd..3b9167674b 100644 --- a/src/ol/interaction/MouseWheelZoom.js +++ b/src/ol/interaction/MouseWheelZoom.js @@ -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, chain, focusWithTabindex} from '../events/condition.js'; +import {all, always, focusWithTabindex} from '../events/condition.js'; import {clamp} from '../math.js'; /** @@ -103,7 +103,7 @@ class MouseWheelZoom extends Interaction { * @type {import("../events/condition.js").Condition} */ this.condition_ = options.onFocusOnly - ? chain(focusWithTabindex, condition) + ? all(focusWithTabindex, condition) : condition; /**