From 2cf798c459f5a0a82064ed3eacb53e7e16e28a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Junod?= <frederic.junod@camptocamp.com>
Date: Tue, 8 Mar 2011 16:31:36 +0000
Subject: [PATCH] remove Control.KeyboardDefaults::destroy method: handler
 destroy already done in the parent class. r=bartvde (closes #3155)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@11678 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Control/KeyboardDefaults.js | 12 ------------
 tests/Control/KeyboardDefaults.html        | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/OpenLayers/Control/KeyboardDefaults.js b/lib/OpenLayers/Control/KeyboardDefaults.js
index 6e6e6581fd..22d9033abe 100644
--- a/lib/OpenLayers/Control/KeyboardDefaults.js
+++ b/lib/OpenLayers/Control/KeyboardDefaults.js
@@ -37,19 +37,7 @@ OpenLayers.Control.KeyboardDefaults = OpenLayers.Class(OpenLayers.Control, {
     /**
      * Constructor: OpenLayers.Control.KeyboardDefaults
      */
-    
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-        if (this.handler) {
-            this.handler.destroy();
-        }        
-        this.handler = null;
         
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-    },
-    
     /**
      * Method: draw
      * Create handler.
diff --git a/tests/Control/KeyboardDefaults.html b/tests/Control/KeyboardDefaults.html
index 4d894183db..225699ea84 100644
--- a/tests/Control/KeyboardDefaults.html
+++ b/tests/Control/KeyboardDefaults.html
@@ -12,6 +12,18 @@
         t.eq( control.displayClass,  "olControlKeyboardDefaults", "displayClass is correct" );
     }
 
+    function test_Control_KeyboardDefaults_destroy (t) {
+        t.plan(2);
+    
+        map = new OpenLayers.Map('map');
+        var control = new OpenLayers.Control.KeyboardDefaults();
+        map.addControl(control);
+        t.ok(control.handler != null, "control.handler is created");
+        control.destroy();
+        t.ok(control.handler == null, "control.handler is null after destroy");
+        map.destroy();
+    }
+
     function test_Control_KeyboardDefaults_addControl (t) {
         t.plan( 4 );