deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix for #1187, #1278 and #1279

Browse source
This commit is contained in:
Brandon Aaron 2007-06-21 19:21:56 +00:00
parent 5bb0902c5e
commit f025ed878b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/event/event.js
View file

@ -148,7 +148,7 @@ jQuery.event = {
data.unshift( this.fix({ type: type, target: element }) ); data.unshift( this.fix({ type: type, target: element }) );
// Trigger the event // 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; this.triggered = true;
if ( fn && val !== false && !jQuery.nodeName(element, 'a') ) if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
@ -577,7 +577,8 @@ jQuery.extend({
document.removeEventListener( "DOMContentLoaded", jQuery.ready, false ); document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
// Remove script element used by IE hack // 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; var els = global[type], i = els.length;
if ( i && type != 'unload' ) if ( i && type != 'unload' )
do do
jQuery.event.remove(els[i-1], type); els[i-1] && jQuery.event.remove(els[i-1], type);
while (--i); while (--i);
} }
}); });