Changeset 2011

Timestamp:

05/31/07 03:51:28 (1 year ago)

Author:

brandon.aaron

Message:

Fix for #923, #1136 and #1233

Files:

• trunk/jquery/src/event/event.js (modified) (3 diffs)

trunk/jquery/src/event/event.js

@@ -65 +65 @@
         if (!this.global[type])
             this.global[type] = [];
-        this.global[type].push( element );
+        // Only add the element to the global list once
+        if (jQuery.inArray(element, this.global[type]) == -1)
+            this.global[type].push( element );
     },
 
@@ -73 +75 @@
     // Detach an event or set of events from an element
     remove: function(element, type, handler) {
-        var events = element.$events, ret;
+        var events = element.$events, ret, index;
 
         if ( events ) {
@@ -105 +107 @@
                     ret = null;
                     delete events[type];
+                    
+                    // Remove element from the global event type cache
+                    while ( this.global[type] && ( (index = jQuery.inArray(element, this.global[type])) >= 0 ) )
+                        delete this.global[type][index];
                 }
             }