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

Merge pull request #3420 from elemoine/leaks

Browse Source 
Unregister viewport size listener on setTarget(null)
This commit is contained in:
Éric Lemoine
2015-04-03 20:07:20 +02:00
parent da9de6ef1b f1d7e2ec85
commit 7c0977de45
3 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ol/map.js
View File

@@ -338,13 +338,17 @@ ol.Map = function(options) {
this.registerDisposable(this.renderer_);
/**
* @type {goog.dom.ViewportSizeMonitor}
* @private
*/
this.viewportSizeMonitor_ = new goog.dom.ViewportSizeMonitor();
this.registerDisposable(this.viewportSizeMonitor_);
goog.events.listen(this.viewportSizeMonitor_, goog.events.EventType.RESIZE,
this.updateSize, false, this);
/**
* @type {goog.events.Key}
* @private
*/
this.viewportResizeListenerKey_ = null;
/**
* @private
@@ -1032,12 +1036,22 @@ ol.Map.prototype.handleTargetChanged_ = function() {
if (goog.isNull(targetElement)) {
goog.dom.removeNode(this.viewport_);
if (!goog.isNull(this.viewportResizeListenerKey_)) {
goog.events.unlistenByKey(this.viewportResizeListenerKey_);
this.viewportResizeListenerKey_ = null;
}
} else {
goog.dom.appendChild(targetElement, this.viewport_);
var keyboardEventTarget = goog.isNull(this.keyboardEventTarget_) ?
targetElement : this.keyboardEventTarget_;
this.keyHandler_.attach(keyboardEventTarget);
if (goog.isNull(this.viewportResizeListenerKey_)) {
this.viewportResizeListenerKey_ = goog.events.listen(
this.viewportSizeMonitor_, goog.events.EventType.RESIZE,
this.updateSize, false, this);
}
}
this.updateSize();