From 056c3ad23e8b9f6dcd8c31e1a2feb3fffd042fc1 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Fri, 27 Mar 2015 13:44:04 +0100 Subject: [PATCH] Add consistency for pointer event handlers Now all are private static functions. --- src/ol/interaction/snapinteraction.js | 40 ++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/ol/interaction/snapinteraction.js b/src/ol/interaction/snapinteraction.js index 3f0ac3a1b9..18bf8a9d22 100644 --- a/src/ol/interaction/snapinteraction.js +++ b/src/ol/interaction/snapinteraction.js @@ -48,9 +48,9 @@ goog.require('ol.structs.RBush'); ol.interaction.Snap = function(opt_options) { goog.base(this, { - handleEvent: this.handleEvent_, + handleEvent: ol.interaction.Snap.handleEvent_, handleDownEvent: goog.functions.TRUE, - handleUpEvent: ol.interaction.Snap.handleUpEvent + handleUpEvent: ol.interaction.Snap.handleUpEvent_ }); var options = goog.isDef(opt_options) ? opt_options : {}; @@ -209,22 +209,6 @@ ol.interaction.Snap.prototype.getFeatures_ = function() { }; -/** - * Handle all pointer events events. - * @param {ol.MapBrowserEvent} evt A move event. - * @return {boolean} Pass the event to other interactions. - * @private - */ -ol.interaction.Snap.prototype.handleEvent_ = function(evt) { - var result = this.snapTo(evt.pixel, evt.coordinate, evt.map); - if (result.snapped) { - evt.coordinate = result.vertex; - evt.pixel = result.vertexPixel; - } - return ol.interaction.Pointer.handleEvent.call(this, evt); -}; - - /** * @param {ol.source.VectorEvent|ol.CollectionEvent} evt Event. * @private @@ -572,12 +556,30 @@ ol.interaction.Snap.ResultType; ol.interaction.Snap.SegmentDataType; +/** + * Handle all pointer events events. + * @param {ol.MapBrowserEvent} evt A move event. + * @return {boolean} Pass the event to other interactions. + * @this {ol.interaction.Snap} + * @private + */ +ol.interaction.Snap.handleEvent_ = function(evt) { + var result = this.snapTo(evt.pixel, evt.coordinate, evt.map); + if (result.snapped) { + evt.coordinate = result.vertex; + evt.pixel = result.vertexPixel; + } + return ol.interaction.Pointer.handleEvent.call(this, evt); +}; + + /** * @param {ol.MapBrowserPointerEvent} evt Event. * @return {boolean} Stop drag sequence? * @this {ol.interaction.Snap} + * @private */ -ol.interaction.Snap.handleUpEvent = function(evt) { +ol.interaction.Snap.handleUpEvent_ = function(evt) { goog.array.forEach(goog.object.getValues(this.pendingFeatures_), this.updateFeature_, this); this.pendingFeatures_ = {};