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

overview map control destroys drag handler too late, r=ahocevar (closes #2383)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@9902 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Éric Lemoine
2009-12-17 08:23:38 +00:00
parent f54fd67504
commit 321a237d2f
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Control/OverviewMap.js
+1
View File
@@ -144,6 +144,7 @@ OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, {
return; return;
} }
this.handlers.click.destroy(); this.handlers.click.destroy();
this.handlers.drag.destroy();
this.mapDiv.removeChild(this.extentRectangle); this.mapDiv.removeChild(this.extentRectangle);
this.extentRectangle = null; this.extentRectangle = null;
tests/Control/OverviewMap.html
+46 -1
View File
@@ -2,7 +2,7 @@
<head> <head>
<script src="../../lib/OpenLayers.js"></script> <script src="../../lib/OpenLayers.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var map; var map;
function test_initialize(t) { function test_initialize(t) {
t.plan( 2 ); t.plan( 2 );
@@ -10,6 +10,51 @@
t.ok( control instanceof OpenLayers.Control.OverviewMap, "new OpenLayers.Control.OverviewMap returns object" ); t.ok( control instanceof OpenLayers.Control.OverviewMap, "new OpenLayers.Control.OverviewMap returns object" );
t.eq( control.displayClass, "olControlOverviewMap", "displayClass is correct" ); t.eq( control.displayClass, "olControlOverviewMap", "displayClass is correct" );
} }
function test_destroy(t) {
t.plan(6);
// set up
var log_drag = [], log_click = [], control;
map = new OpenLayers.Map('map');
map.addLayer(new OpenLayers.Layer("layer", {isBaseLayer: true}));
control = new OpenLayers.Control.OverviewMap();
map.addControl(control);
map.zoomToMaxExtent();
control.handlers.drag.destroy = function() {
log_drag.push({"map": !!this.map.events});
};
control.handlers.click.destroy = function() {
log_click.push({"map": !!this.map.events});
};
// test
control.destroy();
t.eq(log_drag.length, 2,
"destroy() destroys drag handler twice, expected");
if (log_drag.length == 2) {
t.eq(log_drag[0].map, true,
"destroy() destroys drag handler before ovmap is destroyed (0)");
t.eq(log_drag[1].map, false,
"destroy() destroys drag handler after ovmap is destroyed (1)");
}
t.eq(log_click.length, 2,
"destroy() destroys click handler twice, expected");
if (log_click.length == 2) {
t.eq(log_click[0].map, true,
"destroy() destroys click handler before ovmap is destroyed (0)");
t.eq(log_click[1].map, false,
"destroy() destroys click handler after ovmap is destroyed (1)");
}
// tear down
map.destroy();
}
function test_addControl (t) { function test_addControl (t) {
t.plan( 6 ); t.plan( 6 );
map = new OpenLayers.Map('map'); map = new OpenLayers.Map('map');