fix global event triggering that i broke in r6323

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index 4b625a5..ebdcc59 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -160,7 +160,7 @@ jQuery.event = {
                                                        break;
                                                }
                                                if ( !ret ) {
-                                                       if ( !this.special[ type ] || this.special[ type ].teardown.call( elem, namespaces ) === false ) {
+                                                       if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
                                                                if ( elem.removeEventListener ) {
                                                                        elem.removeEventListener( type, jQuery.data( elem, "handle" ), false );
                                                                } else if ( elem.detachEvent ) {
@@ -214,11 +214,11 @@ jQuery.event = {
                                event.stopPropagation();
                                // Only trigger if we've ever bound an event for it
                                if ( this.global[ type ] ) {
-                                       for ( var cached in jQuery.cache ) {
-                                               if ( cached.events && cached.events[ type ] ) {
-                                                       this.trigger( event, data, cached.handle.elem );
+                                       jQuery.each( jQuery.cache, function() {
+                                               if ( this.events && this.events[type] ) {
+                                                       jQuery.event.trigger( event, data, this.handle.elem );
                                                }
-                                       }
+                                       });
                                }
                        }