diff --git a/lib/OpenLayers/Handler/MouseWheel.js b/lib/OpenLayers/Handler/MouseWheel.js index 5d5dac3b3f..2abcdcd558 100644 --- a/lib/OpenLayers/Handler/MouseWheel.js +++ b/lib/OpenLayers/Handler/MouseWheel.js @@ -46,9 +46,8 @@ OpenLayers.Handler.MouseWheel = OpenLayers.Class(OpenLayers.Handler, { * Method: destroy */ destroy: function() { - this.deactivate(); - this.wheelListener = null; OpenLayers.Handler.prototype.destroy.apply(this, arguments); + this.wheelListener = null; }, /** diff --git a/tests/Handler/test_MouseWheel.html b/tests/Handler/test_MouseWheel.html index 2137ab5953..be5187f7f0 100644 --- a/tests/Handler/test_MouseWheel.html +++ b/tests/Handler/test_MouseWheel.html @@ -117,6 +117,15 @@ t.ok(deactivated, "deactivate returns true if the handler was active already"); } + function test_handler_MouseWheel_destroy(t) { + t.plan(1); + var control = new OpenLayers.Control(); + var handler = new OpenLayers.Handler.MouseWheel(control); + handler.deactivate = function() { + t.ok(true, "Deactivate called one time."); + } + handler.destroy(); + }