Fixed several destroy() methods to avoid running into undefined objects when the page unloads. r=crschmidt,me (closes #1222)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@6172 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2008-02-09 18:51:48 +00:00
parent 8e2b4956f2
commit 886b963ce5
3 changed files with 14 additions and 11 deletions

View File

@@ -485,6 +485,12 @@ OpenLayers.Map = OpenLayers.Class({
this.events.unregister("resize", this, this.updateSize);
}
if (this.controls != null) {
for (var i = this.controls.length - 1; i>=0; --i) {
this.controls[i].destroy();
}
this.controls = null;
}
if (this.layers != null) {
for (var i = this.layers.length - 1; i>=0; --i) {
//pass 'false' to destroy so that map wont try to set a new
@@ -493,12 +499,6 @@ OpenLayers.Map = OpenLayers.Class({
}
this.layers = null;
}
if (this.controls != null) {
for (var i = this.controls.length - 1; i>=0; --i) {
this.controls[i].destroy();
}
this.controls = null;
}
if (this.viewPortDiv) {
this.div.removeChild(this.viewPortDiv);
}