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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Control/Panel.js
+2
View File
@@ -95,6 +95,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
* APIMethod: destroy * APIMethod: destroy
*/ */
destroy: function() { destroy: function() {
this.deactivate();
OpenLayers.Control.prototype.destroy.apply(this, arguments); OpenLayers.Control.prototype.destroy.apply(this, arguments);
for(var i = this.controls.length - 1 ; i >= 0; i--) { for(var i = this.controls.length - 1 ; i >= 0; i--) {
if(this.controls[i].events) { if(this.controls[i].events) {
@@ -143,6 +144,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
control = this.controls[i]; control = this.controls[i];
this.activeState[control.id] = control.deactivate(); this.activeState[control.id] = control.deactivate();
} }
this.redraw();
return true; return true;
} else { } else {
return false; return false;
tests/Control/Panel.html
+20 -1
View File
@@ -227,7 +227,26 @@
t.ok(!controlNoDeactive.active, "Tool control autoActivate:true is not active"); t.ok(!controlNoDeactive.active, "Tool control autoActivate:true is not active");
} }
function test_Control_Panel_dectivate (t) {
t.plan(3);
var map = new OpenLayers.Map('map');
var control = new OpenLayers.Control();
var panel = new OpenLayers.Control.Panel();
map.addControl(panel);
panel.addControls([control]);
t.ok(panel.div.innerHTML != "", "Panel displayed after activate");
panel.deactivate();
t.ok(panel.div.innerHTML == "",
"Panel is not displayed after deactivate without any active control");
panel.activate();
var div = panel.div;
panel.destroy();
t.ok(panel.div.innerHTML == "",
"Panel is not displayed after destroy without any active control");
map.destroy();
}
</script> </script>
</head> </head>
<body> <body>