diff --git a/src/ol/control/control.js b/src/ol/control/control.js index 5a31a59715..dba60d9f74 100644 --- a/src/ol/control/control.js +++ b/src/ol/control/control.js @@ -12,6 +12,6 @@ ol.Control = function() { /** - * @param {ol.MapBrowserEvent} event Map browser event. + * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event. */ ol.Control.prototype.handleMapBrowserEvent = goog.abstractMethod; diff --git a/src/ol/control/dblclickzoom.js b/src/ol/control/dblclickzoom.js index 0e23170e57..fd11979d11 100644 --- a/src/ol/control/dblclickzoom.js +++ b/src/ol/control/dblclickzoom.js @@ -19,16 +19,17 @@ goog.inherits(ol.control.DblClickZoom, ol.Control); /** * @inheritDoc */ -ol.control.DblClickZoom.prototype.handleMapBrowserEvent = function(event) { - if (event.type == goog.events.EventType.DBLCLICK) { - var map = event.map; +ol.control.DblClickZoom.prototype.handleMapBrowserEvent = + function(mapBrowserEvent) { + if (mapBrowserEvent.type == goog.events.EventType.DBLCLICK) { + var map = mapBrowserEvent.map; map.whileFrozen(function() { // FIXME compute correct center for zoom - map.setCenter(event.getCoordinate()); - var browserEventObject = event.getBrowserEventObject(); + map.setCenter(mapBrowserEvent.getCoordinate()); + var browserEventObject = mapBrowserEvent.getBrowserEventObject(); var scale = browserEventObject.shiftKey ? 2 : 0.5; map.setResolution(scale * map.getResolution()); }); - event.preventDefault(); + mapBrowserEvent.preventDefault(); } }; diff --git a/src/ol/control/drag.js b/src/ol/control/drag.js index 6077b84238..8a8f0ebc01 100644 --- a/src/ol/control/drag.js +++ b/src/ol/control/drag.js @@ -59,14 +59,14 @@ goog.inherits(ol.control.Drag, ol.Control); /** - * @param {ol.MapBrowserEvent} event Event. + * @param {ol.MapBrowserEvent} mapBrowserEvent Event. * @protected */ ol.control.Drag.prototype.handleDrag = goog.nullFunction; /** - * @param {ol.MapBrowserEvent} event Event. + * @param {ol.MapBrowserEvent} mapBrowserEvent Event. * @protected * @return {boolean} Capture dragging. */ @@ -74,7 +74,7 @@ ol.control.Drag.prototype.handleDragStart = goog.functions.FALSE; /** - * @param {ol.MapBrowserEvent} event Event. + * @param {ol.MapBrowserEvent} mapBrowserEvent Event. * @protected */ ol.control.Drag.prototype.handleDragEnd = goog.nullFunction; @@ -83,35 +83,35 @@ ol.control.Drag.prototype.handleDragEnd = goog.nullFunction; /** * @inheritDoc */ -ol.control.Drag.prototype.handleMapBrowserEvent = function(event) { +ol.control.Drag.prototype.handleMapBrowserEvent = function(mapBrowserEvent) { var browserEventObject; if (this.dragging_) { - if (event.type == goog.events.EventType.MOUSEMOVE || - event.type == goog.events.EventType.MOUSEOUT || - event.type == goog.events.EventType.MOUSEUP) { - browserEventObject = event.getBrowserEventObject(); + if (mapBrowserEvent.type == goog.events.EventType.MOUSEMOVE || + mapBrowserEvent.type == goog.events.EventType.MOUSEOUT || + mapBrowserEvent.type == goog.events.EventType.MOUSEUP) { + browserEventObject = mapBrowserEvent.getBrowserEventObject(); this.deltaX = browserEventObject.offsetX - this.startX; this.deltaY = browserEventObject.offsetY - this.startY; - if (event.type == goog.events.EventType.MOUSEMOVE) { - this.handleDrag(event); + if (mapBrowserEvent.type == goog.events.EventType.MOUSEMOVE) { + this.handleDrag(mapBrowserEvent); } else { - this.handleDragEnd(event); + this.handleDragEnd(mapBrowserEvent); this.dragging_ = false; } - event.preventDefault(); + mapBrowserEvent.preventDefault(); } } else { - if (event.type == goog.events.EventType.MOUSEDOWN) { - browserEventObject = event.getBrowserEventObject(); + if (mapBrowserEvent.type == goog.events.EventType.MOUSEDOWN) { + browserEventObject = mapBrowserEvent.getBrowserEventObject(); this.startX = browserEventObject.offsetX; this.startY = browserEventObject.offsetY; this.deltaX = 0; this.deltaY = 0; - this.startCenter = event.map.getCenter(); - this.startCoordinate = event.getCoordinate(); - if (this.handleDragStart(event)) { + this.startCenter = mapBrowserEvent.map.getCenter(); + this.startCoordinate = mapBrowserEvent.getCoordinate(); + if (this.handleDragStart(mapBrowserEvent)) { this.dragging_ = true; - event.preventDefault(); + mapBrowserEvent.preventDefault(); } } } diff --git a/src/ol/control/dragpan.js b/src/ol/control/dragpan.js index 7f7302db93..4c8f85e22d 100644 --- a/src/ol/control/dragpan.js +++ b/src/ol/control/dragpan.js @@ -20,8 +20,8 @@ goog.inherits(ol.control.DragPan, ol.control.Drag); /** * @inheritDoc */ -ol.control.DragPan.prototype.handleDrag = function(event) { - var map = event.map; +ol.control.DragPan.prototype.handleDrag = function(mapBrowserEvent) { + var map = mapBrowserEvent.map; var resolution = map.getResolution(); var center = new goog.math.Coordinate( this.startCenter.x - resolution * this.deltaX, diff --git a/src/ol/control/mousewheelzoom.js b/src/ol/control/mousewheelzoom.js index 8b94a52b7a..0decb59dab 100644 --- a/src/ol/control/mousewheelzoom.js +++ b/src/ol/control/mousewheelzoom.js @@ -19,20 +19,22 @@ goog.inherits(ol.control.MouseWheelZoom, ol.Control); /** * @inheritDoc */ -ol.control.MouseWheelZoom.prototype.handleMapBrowserEvent = function(event) { - if (event.type == goog.events.MouseWheelHandler.EventType.MOUSEWHEEL) { - var map = event.map; +ol.control.MouseWheelZoom.prototype.handleMapBrowserEvent = + function(mapBrowserEvent) { + if (mapBrowserEvent.type == + goog.events.MouseWheelHandler.EventType.MOUSEWHEEL) { + var map = mapBrowserEvent.map; var mouseWheelEvent = /** @type {goog.events.MouseWheelEvent} */ - event.getBrowserEventObject(); + mapBrowserEvent.getBrowserEventObject(); goog.asserts.assert(mouseWheelEvent instanceof goog.events.MouseWheelEvent); if (mouseWheelEvent.deltaY !== 0) { map.whileFrozen(function() { // FIXME compute correct center for zoom - map.setCenter(event.getCoordinate()); + map.setCenter(mapBrowserEvent.getCoordinate()); var scale = mouseWheelEvent.deltaY < 0 ? 0.5 : 2; map.setResolution(scale * map.getResolution()); }); - event.preventDefault(); + mapBrowserEvent.preventDefault(); mouseWheelEvent.preventDefault(); } }