partially reverted r10732 (because we don't deactivate controls on destrly) and reverted r10810 (because it is not needed any more). r=elemoine (closes #2864)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@10834 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
2010-10-14 10:57:31 +00:00
parent 758a252bd8
commit ea3999d755
3 changed files with 4 additions and 13 deletions
@@ -343,10 +343,7 @@ OpenLayers.Control = OpenLayers.Class({
                    this.displayClass.replace(/ /g, "") + "Active"
                );
            }
-            // deal with the case where the control is destroyed
-            if(this.events) {
-                this.events.triggerEvent("deactivate");
-            }
+            this.events.triggerEvent("deactivate");
            return true;
        }
        return false;