Use goog.dispose

This commit is contained in:
tsauerwein
2014-03-07 09:49:42 +01:00
parent 79424ec856
commit 42f0dfa75a

View File

@@ -266,7 +266,7 @@ ol.MapBrowserEventHandler.prototype.handlePointerUp_ = function(pointerEvent) {
if (this.activePointers_ === 0) { if (this.activePointers_ === 0) {
goog.array.forEach(this.dragListenerKeys_, goog.events.unlistenByKey); goog.array.forEach(this.dragListenerKeys_, goog.events.unlistenByKey);
this.dragListenerKeys_ = null; this.dragListenerKeys_ = null;
this.documentPointerEventHandler_.dispose(); goog.dispose(this.documentPointerEventHandler_);
this.documentPointerEventHandler_ = null; this.documentPointerEventHandler_ = null;
} }
@@ -378,11 +378,11 @@ ol.MapBrowserEventHandler.prototype.disposeInternal = function() {
this.dragListenerKeys_ = null; this.dragListenerKeys_ = null;
} }
if (!goog.isNull(this.documentPointerEventHandler_)) { if (!goog.isNull(this.documentPointerEventHandler_)) {
this.documentPointerEventHandler_.dispose(); goog.dispose(this.documentPointerEventHandler_);
this.documentPointerEventHandler_ = null; this.documentPointerEventHandler_ = null;
} }
if (!goog.isNull(this.pointerEventHandler_)) { if (!goog.isNull(this.pointerEventHandler_)) {
this.pointerEventHandler_.dispose(); goog.dispose(this.pointerEventHandler_);
this.pointerEventHandler_ = null; this.pointerEventHandler_ = null;
} }
goog.base(this, 'disposeInternal'); goog.base(this, 'disposeInternal');