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

Store listener keys into an array instead of individual variables

Browse Source
This commit is contained in:
Frederic Junod
2013-06-06 12:08:32 +02:00
parent fd62963ad2
commit ece2a4b64c
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/ol/mapbrowserevent.js
View File

@@ -136,22 +136,10 @@ ol.MapBrowserEventHandler = function(map) {
this.timestamp_ = null;
/**
* @type {?number}
* @type {Array.<number>}
* @private
*/
this.clickListenerKey_ = null;
/**
* @type {?number}
* @private
*/
this.downListenerKey_ = null;
/**
* @type {?number}
* @private
*/
this.moveListenerKey_ = null;
this.listenerKeys_ = null;
/**
* @type {Array.<number>}
@@ -172,15 +160,17 @@ ol.MapBrowserEventHandler = function(map) {
this.down_ = null;
var element = this.map_.getViewport();
this.clickListenerKey_ = goog.events.listen(element,
[goog.events.EventType.CLICK, goog.events.EventType.DBLCLICK],
this.click_, false, this);
this.downListenerKey_ = goog.events.listen(element,
goog.events.EventType.MOUSEDOWN,
this.handleMouseDown_, false, this);
this.moveListenerKey_ = goog.events.listen(element,
goog.events.EventType.MOUSEMOVE,
this.relayMouseMove_, false, this);
this.listenerKeys_ = [
goog.events.listen(element,
[goog.events.EventType.CLICK, goog.events.EventType.DBLCLICK],
this.click_, false, this),
goog.events.listen(element,
goog.events.EventType.MOUSEDOWN,
this.handleMouseDown_, false, this),
goog.events.listen(element,
goog.events.EventType.MOUSEMOVE,
this.relayMouseMove_, false, this)
];
// touch events
this.touchListenerKeys_ = [
goog.events.listen(element, [
@@ -352,9 +342,10 @@ ol.MapBrowserEventHandler.prototype.handleTouchEnd_ = function(browserEvent) {
* FIXME empty description for jsdoc
*/
ol.MapBrowserEventHandler.prototype.disposeInternal = function() {
goog.events.unlistenByKey(this.clickListenerKey_);
goog.events.unlistenByKey(this.downListenerKey_);
goog.events.unlistenByKey(this.moveListenerKey_);
if (!goog.isNull(this.listenerKeys_)) {
goog.array.forEach(this.listenerKeys_, goog.events.unlistenByKey);
this.listenerKeys_ = null;
}
if (!goog.isNull(this.dragListenerKeys_)) {
goog.array.forEach(this.dragListenerKeys_, goog.events.unlistenByKey);
this.dragListenerKeys_ = null;