From c3709ef51a49e01cc24214cd5c48b38c171649dd Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Wed, 20 Feb 2019 17:23:50 +0700 Subject: [PATCH] remove arrow function, add JSDoc and restore original Draw --- src/ol/events/condition.js | 18 ++++++++++++++++-- src/ol/interaction/Draw.js | 3 ++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/ol/events/condition.js b/src/ol/events/condition.js index 280a36bd87..ca391900f5 100644 --- a/src/ol/events/condition.js +++ b/src/ol/events/condition.js @@ -230,14 +230,28 @@ export const mouseOnly = function(mapBrowserEvent) { return pointerEvent.pointerType == 'mouse'; }; -export const touchOnly = (mapBrowserEvent) => { +/** + * Return `true` if the event originates from a touchable device. + * + * @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event. + * @return {boolean} True if the event originates from a touchable device. + * @api + */ +export const touchOnly = function(mapBrowserEvent) { const pointerEvt = /** @type {import("../MapBrowserPointerEvent").default} */ (mapBrowserEvent).pointerEvent; assert(pointerEvt !== undefined, 56); // mapBrowserEvent must originate from a pointer event // see http://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType return pointerEvt.pointerType === 'touch'; }; -export const penOnly = (mapBrowserEvent) => { +/** + * Return `true` if the event originates from a digital pen. + * + * @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event. + * @return {boolean} True if the event originates from a digital pen. + * @api + */ +export const penOnly = function(mapBrowserEvent) { const pointerEvt = /** @type {import("../MapBrowserPointerEvent").default} */ (mapBrowserEvent).pointerEvent; assert(pointerEvt !== undefined, 56); // mapBrowserEvent must originate from a pointer event // see http://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js index d9b165b386..3d28104798 100644 --- a/src/ol/interaction/Draw.js +++ b/src/ol/interaction/Draw.js @@ -528,7 +528,7 @@ class Draw extends PointerInteraction { handleDownEvent(event) { this.shouldHandle_ = !this.freehand_; - if (this.freehand_ && ((this.condition_ && this.condition_(event)) || true)) { + if (this.freehand_) { this.downPx_ = event.pixel; if (!this.finishCoordinate_) { this.startDrawing_(event); @@ -548,6 +548,7 @@ class Draw extends PointerInteraction { } } + /** * @inheritDoc */