From 46c5cd681293baec90e8a0b83aa25f8b4b2e0017 Mon Sep 17 00:00:00 2001
From: crschmidt <crschmidt@crschmidt.net>
Date: Wed, 29 Aug 2007 04:21:17 +0000
Subject: [PATCH] Properly destroy OpenLayers.Handler.MouseWheel, patch from
 fredj. Added tests for it as well. (Closes #935)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@4100 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Handler/MouseWheel.js | 3 +--
 tests/Handler/test_MouseWheel.html   | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

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();
+    }
 
 
   </script>