diff options
| author | Brandon Aaron <brandon.aaron@gmail.com> | 2007-06-21 19:21:56 +0000 |
|---|---|---|
| committer | Brandon Aaron <brandon.aaron@gmail.com> | 2007-06-21 19:21:56 +0000 |
| commit | f025ed878bcf610971f294fd931edfe30aa18a9e (patch) | |
| tree | 4bd39a76afbbc8d950dc1e855989669956c6db46 /src | |
| parent | 5bb0902c5ef4cf767a5940799826e57f2fcfdd34 (diff) | |
| download | jquery-f025ed878bcf610971f294fd931edfe30aa18a9e.tar.gz jquery-f025ed878bcf610971f294fd931edfe30aa18a9e.zip | |
Fix for #1187, #1278 and #1279
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/event.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/event/event.js b/src/event/event.js index 623bcf32a..bea2cbac7 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -148,7 +148,7 @@ jQuery.event = { data.unshift( this.fix({ type: type, target: element }) ); // 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; if ( fn && val !== false && !jQuery.nodeName(element, 'a') ) @@ -577,7 +577,8 @@ jQuery.extend({ document.removeEventListener( "DOMContentLoaded", jQuery.ready, false ); // 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(); }); } } }); @@ -991,7 +992,7 @@ if (jQuery.browser.msie) var els = global[type], i = els.length; if ( i && type != 'unload' ) do - jQuery.event.remove(els[i-1], type); + els[i-1] && jQuery.event.remove(els[i-1], type); while (--i); } }); |