diff --git a/src/ol/event/Drag.js b/src/ol/event/Drag.js index 2ef0bec8db..af1eee8fe3 100644 --- a/src/ol/event/Drag.js +++ b/src/ol/event/Drag.js @@ -43,8 +43,8 @@ ol.event.Drag = function(target) { } // no default for mousemove and touchmove events to avoid page scrolling. - target.register('mousemove', this.preventDefault); - target.register('touchmove', this.preventDefault); + target.register('mousemove', ol.event.preventDefault); + target.register('touchmove', ol.event.preventDefault); dragger.defaultAction = function(x, y) {}; dragger.addEventListener(goog.fx.Dragger.EventType.START, function(evt) { @@ -83,17 +83,10 @@ ol.event.Drag = function(target) { ); }; -/** - * @private - */ -ol.event.Drag.prototype.preventDefault = function(evt) { - evt.preventDefault(); -}; - /** @inheritDoc */ ol.event.Drag.prototype.destroy = function() { - this.target_.unregister('mousemove', this.preventDefault); - this.target_.unregister('touchmove', this.preventDefault); + this.target_.unregister('mousemove', ol.event.preventDefault); + this.target_.unregister('touchmove', ol.event.preventDefault); this.dragger_.dispose(); goog.object.clear(this); }; diff --git a/src/ol/event/Events.js b/src/ol/event/Events.js index fe65d8b363..9089779aec 100644 --- a/src/ol/event/Events.js +++ b/src/ol/event/Events.js @@ -42,16 +42,21 @@ ol.event.isMultiTouch = function(evt) { }; /** - * Is the event a keyboard event with Enter or Space pressed? + * Call preventDefault on the provided event. * * @param {!Event} evt - * @return {boolean} */ -ol.event.isEnterOrSpace = function(evt) { - return evt.type === "keypress" && - (evt.keyCode === goog.events.KeyCodes.ENTER || - evt.keyCode === goog.events.KeyCodes.SPACE || - evt.keyCode === goog.events.KeyCodes.MAC_ENTER); +ol.event.preventDefault = function(evt) { + evt.preventDefault(); +}; + +/** + * Call stopPropagation on the provided event. + * + * @param {!Event} evt + */ +ol.event.stopPropagation = function(evt) { + evt.stopPropagation(); };