Changeset 8308

Timestamp:

04/26/07 11:12:28 (19 months ago)

Author:

sjmiles

Message:

Make sure stealth onkeydown listeners are disconnected with their progenitors. Fixes last known missing requirement for event.js. Refs #2641

Files:

• dojo/trunk/_base/event.js (modified) (1 diff)

dojo/trunk/_base/event.js

@@ -271 +271 @@
                                 if(!node){return;} // undefined
                                 event = de._normalizeEventName(event);
-                                // FIXME: we need a way to disconnect this extra listener
-                                if(node && (event=="onkeypress")){
-                                        de.addListener(node, "onkeydown", de._nop);
-                                }
-                                return iel.add(node, event, de._fixCallback(fp));
+                                var handle = iel.add(node, event, de._fixCallback(fp));
+                                if(event=="onkeypress"){
+                                        // FIXME: we are using the knowledge that handle
+                                        // is an Integer, which is supposed to be private.
+                                        // Perhaps the listener could natively return a 
+                                        // Number object instead of a concrete value.
+                                        handle = new Number(handle);
+                                        handle.keydown = de.addListener(node, "onkeydown", de._nop);
+                                }
+                                return handle;
                         },
                         removeListener: function(/*DOMNode*/node, /*String*/event, /*Handle*/handle){
                                 iel.remove(node, de._normalizeEventName(event), handle); 
+                                if(handle.keydown){iel.remove(node, "onkeydown", handle.keydown);} 
                         },
                         _normalizeEventName: function(/*String*/eventName){