Changeset 2136

Timestamp:

06/21/07 19:21:56 (1 year ago)

Author:

brandon.aaron

Message:

Fix for #1187, #1278 and #1279

Files:

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

trunk/jquery/src/event/event.js

@@ -149 +149 @@
 
             // Trigger the event
-            if ( (val = element.$handle.apply( element, data )) !== false )
+            if ( jQuery.isFunction(element.$handle) && (val = element.$handle.apply( element, data )) !== false )
                 this.triggered = true;
 
@@ -578 +578 @@
             
             // Remove script element used by IE hack
-            jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
+            if( !window.frames.length ) // don't remove if frames are present (#1187)
+                jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
         }
     }
@@ -992 +993 @@
             if ( i && type != 'unload' )
                 do
-                    jQuery.event.remove(els[i-1], type);
+                    els[i-1] && jQuery.event.remove(els[i-1], type);
                 while (--i);
         }