Avoid panel being displayed after deactivate. p=jorix, r=me (closes #2835)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@10732 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2010-09-13 13:26:07 +00:00
parent 35092e9226
commit a1f20ee345
2 changed files with 22 additions and 1 deletions

View File

@@ -95,6 +95,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
* APIMethod: destroy
*/
destroy: function() {
this.deactivate();
OpenLayers.Control.prototype.destroy.apply(this, arguments);
for(var i = this.controls.length - 1 ; i >= 0; i--) {
if(this.controls[i].events) {
@@ -143,6 +144,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
control = this.controls[i];
this.activeState[control.id] = control.deactivate();
}
this.redraw();
return true;
} else {
return false;