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

Remove pressed_ variable and rely on down_ to check if a mouse button is pressed

Browse Source
This commit is contained in:
Frederic Junod
2013-08-28 11:28:50 +02:00
parent dc5b209f7f
commit ecf953a125
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ol/mapbrowserevent.js
View File

@@ -123,13 +123,6 @@ ol.MapBrowserEventHandler = function(map) {
*/ */
this.map_ = map; this.map_ = map;
/**
* Whether one of the mouse button is pressed.
* @type {boolean}
* @private
*/
this.pressed_ = false;
/** /**
* @type {boolean} * @type {boolean}
* @private * @private
@@ -232,11 +225,10 @@ ol.MapBrowserEventHandler.prototype.click_ = function(browserEvent) {
* @private * @private
*/ */
ol.MapBrowserEventHandler.prototype.handleMouseUp_ = function(browserEvent) { ol.MapBrowserEventHandler.prototype.handleMouseUp_ = function(browserEvent) {
if (this.pressed_) { if (this.down_) {
this.down_ = null; this.down_ = null;
goog.array.forEach(this.dragListenerKeys_, goog.events.unlistenByKey); goog.array.forEach(this.dragListenerKeys_, goog.events.unlistenByKey);
this.dragListenerKeys_ = null; this.dragListenerKeys_ = null;
this.pressed_ = false;
if (this.dragged_) { if (this.dragged_) {
var newEvent = new ol.MapBrowserEvent( var newEvent = new ol.MapBrowserEvent(
ol.MapBrowserEvent.EventType.DRAGEND, this.map_, browserEvent); ol.MapBrowserEvent.EventType.DRAGEND, this.map_, browserEvent);
@@ -254,9 +246,8 @@ ol.MapBrowserEventHandler.prototype.handleMouseDown_ = function(browserEvent) {
var newEvent = new ol.MapBrowserEvent( var newEvent = new ol.MapBrowserEvent(
ol.MapBrowserEvent.EventType.DOWN, this.map_, browserEvent); ol.MapBrowserEvent.EventType.DOWN, this.map_, browserEvent);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);
if (!this.pressed_) { if (!this.down_) {
this.down_ = browserEvent; this.down_ = browserEvent;
this.pressed_ = true;
this.dragged_ = false; this.dragged_ = false;
this.dragListenerKeys_ = [ this.dragListenerKeys_ = [
goog.events.listen(goog.global.document, goog.events.EventType.MOUSEMOVE, goog.events.listen(goog.global.document, goog.events.EventType.MOUSEMOVE,