From 8a26ac6e24b5135ea4878292150508a8acc2aee8 Mon Sep 17 00:00:00 2001 From: tsauerwein Date: Thu, 13 Mar 2014 13:45:03 +0100 Subject: [PATCH] Set preventDefault in PointerEvent constructor --- src/ol/pointer/pointerevent.js | 6 ++++++ src/ol/pointer/pointereventhandler.js | 11 +---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/ol/pointer/pointerevent.js b/src/ol/pointer/pointerevent.js index c9d1b60c02..4beda58fdb 100644 --- a/src/ol/pointer/pointerevent.js +++ b/src/ol/pointer/pointerevent.js @@ -192,6 +192,12 @@ ol.pointer.PointerEvent = function(type, browserEvent, opt_eventDict) { */ this.isPrimary = goog.object.get(eventDict, 'isPrimary', false); + // keep the semantics of preventDefault + if (browserEvent.preventDefault) { + this.preventDefault = function() { + browserEvent.preventDefault(); + }; + } }; goog.inherits(ol.pointer.PointerEvent, goog.events.Event); diff --git a/src/ol/pointer/pointereventhandler.js b/src/ol/pointer/pointereventhandler.js index 7d64086b19..3679dfc12f 100644 --- a/src/ol/pointer/pointereventhandler.js +++ b/src/ol/pointer/pointereventhandler.js @@ -384,16 +384,7 @@ ol.pointer.PointerEventHandler.prototype.contains_ = */ ol.pointer.PointerEventHandler.prototype.makeEvent = function(inType, pointerEventData, browserEvent) { - var e = new ol.pointer.PointerEvent(inType, browserEvent, pointerEventData); - - // keep the semantics of preventDefault - if (browserEvent.preventDefault) { - e.preventDefault = function() { - browserEvent.preventDefault(); - }; - } - - return e; + return new ol.pointer.PointerEvent(inType, browserEvent, pointerEventData); };