ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make browserEvent property public

Browse Source
This commit is contained in:
Tom Payne
2012-07-22 13:30:26 +02:00
parent 5e2a5dfbc4
commit 7ed71f7149
6 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/control/dblclickzoom.js
View File

@@ -26,8 +26,8 @@ ol.control.DblClickZoom.prototype.handleMapBrowserEvent =
map.whileFrozen(function() {
// FIXME compute correct center for zoom
map.setCenter(mapBrowserEvent.getCoordinate());
var browserEventObject = mapBrowserEvent.getBrowserEventObject();
var scale = browserEventObject.shiftKey ? 2 : 0.5;
var browserEvent = mapBrowserEvent.browserEvent;
var scale = browserEvent.shiftKey ? 2 : 0.5;
map.setResolution(scale * map.getResolution());
});
mapBrowserEvent.preventDefault();

14
src/ol/control/drag.js
View File

@@ -90,14 +90,14 @@ ol.control.Drag.prototype.handleMapBrowserEvent = function(mapBrowserEvent) {
if (!goog.isDef(center) || !goog.isDef(resolution)) {
return;
}
var browserEventObject;
var browserEvent;
if (this.dragging_) {
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;
browserEvent = mapBrowserEvent.browserEvent;
this.deltaX = browserEvent.offsetX - this.startX;
this.deltaY = browserEvent.offsetY - this.startY;
if (mapBrowserEvent.type == goog.events.EventType.MOUSEMOVE) {
this.handleDrag(mapBrowserEvent);
} else {
@@ -108,9 +108,9 @@ ol.control.Drag.prototype.handleMapBrowserEvent = function(mapBrowserEvent) {
}
} else {
if (mapBrowserEvent.type == goog.events.EventType.MOUSEDOWN) {
browserEventObject = mapBrowserEvent.getBrowserEventObject();
this.startX = browserEventObject.offsetX;
this.startY = browserEventObject.offsetY;
browserEvent = mapBrowserEvent.browserEvent;
this.startX = browserEvent.offsetX;
this.startY = browserEvent.offsetY;
this.deltaX = 0;
this.deltaY = 0;
this.startCenter = center;

6
src/ol/control/dragpan.js
View File

@@ -33,9 +33,9 @@ ol.control.DragPan.prototype.handleDrag = function(mapBrowserEvent) {
* @inheritDoc
*/
ol.control.DragPan.prototype.handleDragStart = function(mapBrowserEvent) {
var browserEventObject = mapBrowserEvent.getBrowserEventObject();
if (!browserEventObject.shiftKey) {
browserEventObject.preventDefault();
var browserEvent = mapBrowserEvent.browserEvent;
if (!browserEvent.shiftKey) {
browserEvent.preventDefault();
return true;
} else {
return false;

6
src/ol/control/dragzoom.js
View File

@@ -42,9 +42,9 @@ ol.control.DragZoom.prototype.handleDragEnd = function(mapBrowserEvent) {
* @inheritDoc
*/
ol.control.DragZoom.prototype.handleDragStart = function(mapBrowserEvent) {
var browserEventObject = mapBrowserEvent.getBrowserEventObject();
if (browserEventObject.shiftKey) {
browserEventObject.preventDefault();
var browserEvent = mapBrowserEvent.browserEvent;
if (browserEvent.shiftKey) {
browserEvent.preventDefault();
return true;
} else {
return false;

2
src/ol/control/mousewheelzoom.js
View File

@@ -25,7 +25,7 @@ ol.control.MouseWheelZoom.prototype.handleMapBrowserEvent =
goog.events.MouseWheelHandler.EventType.MOUSEWHEEL) {
var map = mapBrowserEvent.map;
var mouseWheelEvent = /** @type {goog.events.MouseWheelEvent} */
mapBrowserEvent.getBrowserEventObject();
mapBrowserEvent.browserEvent;
goog.asserts.assert(mouseWheelEvent instanceof goog.events.MouseWheelEvent);
if (mouseWheelEvent.deltaY !== 0) {
map.whileFrozen(function() {