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

use goog.fx.Dragger for map drag

Browse Source
This commit is contained in:
Éric Lemoine
2012-07-23 23:26:48 +02:00
parent 58bd2182a6
commit 6d28ad2740
2 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/base/map.js
+26 -7
View File
@@ -20,6 +20,8 @@ goog.require('goog.events.KeyHandler.EventType');
goog.require('goog.events.MouseWheelEvent');
goog.require('goog.events.MouseWheelHandler');
goog.require('goog.events.MouseWheelHandler.EventType');
goog.require('goog.fx.DragEvent');
goog.require('goog.fx.Dragger');
goog.require('goog.fx.anim');
goog.require('goog.fx.anim.Animated');
goog.require('goog.object');
@@ -99,11 +101,7 @@ ol.Map = function(target, opt_values, opt_viewportSizeMonitor) {
target.appendChild(this.eventsPane_);
goog.events.listen(this.eventsPane_, [
goog.events.EventType.DBLCLICK,
goog.events.EventType.MOUSEDOWN,
goog.events.EventType.MOUSEMOVE,
goog.events.EventType.MOUSEOUT,
goog.events.EventType.MOUSEUP
goog.events.EventType.DBLCLICK
], this.handleBrowserEvent, false, this);
// FIXME we probably shouldn't listen on document...
@@ -118,6 +116,16 @@ ol.Map = function(target, opt_values, opt_viewportSizeMonitor) {
this.handleBrowserEvent, false, this);
this.registerDisposable(mouseWheelHandler);
var dragger = new goog.fx.Dragger(this.eventsPane_);
dragger.defaultAction = function() {};
goog.events.listen(dragger, [
goog.fx.Dragger.EventType.START,
goog.fx.Dragger.EventType.DRAG,
goog.fx.Dragger.EventType.END,
goog.fx.Dragger.EventType.EARLY_CANCEL
], this.handleDraggerEvent, false, this);
this.registerDisposable(dragger);
/**
* @private
* @type {goog.fx.anim.Animated}
@@ -445,9 +453,11 @@ ol.Map.prototype.handleBackgroundColorChanged = goog.nullFunction;
/**
* @param {goog.events.BrowserEvent} event Event.
* @param {string=} opt_type Type.
*/
ol.Map.prototype.handleBrowserEvent = function(event) {
var mapBrowserEvent = new ol.MapBrowserEvent(event.type, this, event);
ol.Map.prototype.handleBrowserEvent = function(event, opt_type) {
var type = goog.isDef(opt_type) ? opt_type : event.type;
var mapBrowserEvent = new ol.MapBrowserEvent(type, this, event);
var controls = this.getControls();
var controlsArray = /** @type {Array.<ol.Control>} */ controls.getArray();
goog.array.every(controlsArray, function(control) {
@@ -457,6 +467,15 @@ ol.Map.prototype.handleBrowserEvent = function(event) {
};
/**
* @param {goog.fx.DragEvent} event Event.
*/
ol.Map.prototype.handleDraggerEvent = function(event) {
var browserEvent = event.browserEvent;
this.handleBrowserEvent(browserEvent, event.type);
};
/**
* @protected
*/