No more need for listener keys array

This commit is contained in:
Éric Lemoine
2013-01-24 22:24:51 +01:00
parent 4a64837ba1
commit 80b38e608b
2 changed files with 7 additions and 18 deletions
@@ -76,15 +76,6 @@ ol.renderer.canvas.Map.prototype.getCanvas = function() {
}; };
/**
* @param {goog.events.Event} event Event.
* @protected
*/
ol.renderer.canvas.Map.prototype.handleLayerRendererChange = function(event) {
this.getMap().render();
};
/** /**
* @inheritDoc * @inheritDoc
*/ */
+7 -9
View File
@@ -42,20 +42,18 @@ ol.renderer.Map = function(container, map) {
/** /**
* @private * @private
* @type {Array.<number>} * @type {?number}
*/ */
this.layersListenerKeys_ = null; this.mapLayersChangedListenerKey_ =
goog.events.listen(
map, ol.Object.getChangedEventType(ol.MapProperty.LAYERS),
this.handleLayersChanged, false, this);
/** /**
* @private * @private
* @type {Array.<number>} * @type {Array.<number>}
*/ */
this.mapListenerKeys_ = [ this.layersListenerKeys_ = null;
goog.events.listen(
map, ol.Object.getChangedEventType(ol.MapProperty.LAYERS),
this.handleLayersChanged, false, this)
];
}; };
goog.inherits(ol.renderer.Map, goog.Disposable); goog.inherits(ol.renderer.Map, goog.Disposable);
@@ -118,7 +116,7 @@ ol.renderer.Map.prototype.disposeInternal = function() {
goog.object.forEach(this.layerRenderers, function(layerRenderer) { goog.object.forEach(this.layerRenderers, function(layerRenderer) {
goog.dispose(layerRenderer); goog.dispose(layerRenderer);
}); });
goog.array.forEach(this.mapListenerKeys_, goog.events.unlistenByKey); goog.events.unlistenByKey(this.mapLayersChangedListenerKey_);
if (!goog.isNull(this.layersListenerKeys_)) { if (!goog.isNull(this.layersListenerKeys_)) {
goog.array.forEach(this.layersListenerKeys_, goog.events.unlistenByKey); goog.array.forEach(this.layersListenerKeys_, goog.events.unlistenByKey);
} }