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

Commit fix for #726 from andreas, with proper tests.

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@3389 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2007-06-20 23:53:51 +00:00
parent afa2270c83
commit 3cd58c5121
3 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Control/Panel.js
+3 -1
View File
@@ -116,7 +116,9 @@ OpenLayers.Control.Panel.prototype =
if (this.controls[i] == control) { if (this.controls[i] == control) {
control.activate(); control.activate();
} else { } else {
this.controls[i].deactivate(); if (this.controls[i].type != OpenLayers.Control.TYPE_TOGGLE) {
this.controls[i].deactivate();
}
} }
} }
this.redraw(); this.redraw();
tests/Control/test_Panel.html
+39 -1
View File
@@ -2,13 +2,51 @@
<head> <head>
<script src="../../lib/OpenLayers.js"></script> <script src="../../lib/OpenLayers.js"></script>
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var map;
function test_Control_Panel_constructor (t) { function test_Control_Panel_constructor (t) {
t.plan( 1 ); t.plan( 1 );
control = new OpenLayers.Control.Panel(); control = new OpenLayers.Control.Panel();
t.ok( control instanceof OpenLayers.Control.Panel, "new OpenLayers.Control returns object" ); t.ok( control instanceof OpenLayers.Control.Panel, "new OpenLayers.Control returns object" );
} }
function test_01_Control_Panel_constructor (t) {
t.plan(5);
var map = new OpenLayers.Map('map');
var panel = new OpenLayers.Control.Panel();
var toolControl = new OpenLayers.Control.ZoomBox();
var AnotherToolControl = OpenLayers.Class.create();
AnotherToolControl.prototype = OpenLayers.Class.inherit(OpenLayers.Control, {
CLASS_NAME: 'mbControl.TestTool',
type: OpenLayers.Control.TYPE_TOOL
});
var anotherToolControl = new AnotherToolControl();
var ToggleControl = OpenLayers.Class.create();
ToggleControl.prototype = OpenLayers.Class.inherit(OpenLayers.Control, {
CLASS_NAME: 'mbControl.TestToggle',
type: OpenLayers.Control.TYPE_TOGGLE,
});
var toggleControl = new ToggleControl();
t.ok(panel instanceof OpenLayers.Control.Panel,
"new OpenLayers.Control.Panel returns object");
panel.addControls([toolControl, anotherToolControl, toggleControl]);
t.eq(panel.controls.length, 3,
"added three controls to the panel");
map.addControl(panel);
panel.activateControl(toolControl);
t.ok(toolControl.active && !anotherToolControl.active && !toggleControl.active,
"activated one tool control, the other one is inactive and the toggle control also.");
panel.activateControl(toggleControl);
t.ok(toolControl.active && !anotherToolControl.active && toggleControl.active,
"activated the toggle control, which has no influence on the tool controls.");
panel.activateControl(anotherToolControl);
t.ok(!toolControl.active && anotherToolControl.active && toggleControl.active,
"activated the other tool control, the first one is inactive and the toggle control still active.");
}
// --> // -->
</script> </script>
</head> </head>
tests/list-tests.html
+1
View File
@@ -57,6 +57,7 @@
<li>Control/test_NavToolbar.html</li> <li>Control/test_NavToolbar.html</li>
<li>Control/test_MouseToolbar.html</li> <li>Control/test_MouseToolbar.html</li>
<li>Control/test_LayerSwitcher.html</li> <li>Control/test_LayerSwitcher.html</li>
<li>Control/test_Panel.html</li>
<li>Control/test_PanZoom.html</li> <li>Control/test_PanZoom.html</li>
<li>Control/test_PanZoomBar.html</li> <li>Control/test_PanZoomBar.html</li>
<li>Control/test_Permalink.html</li> <li>Control/test_Permalink.html</li>