Fix for #1925 and removed some unnecessary browser sniffing

This commit is contained in:
Brandon Aaron 2007-11-14 21:55:45 +00:00
parent ee52c89dc9
commit ab96367f12

View file

@ -253,11 +253,11 @@ jQuery.event = {
}; };
// Fix target property, if necessary // Fix target property, if necessary
if ( !event.target && event.srcElement ) if ( !event.target )
event.target = event.srcElement; event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
// check if target is a textnode (safari) // check if target is a textnode (safari)
if (jQuery.browser.safari && event.target.nodeType == 3) if ( event.target.nodeType == 3 )
event.target = originalEvent.target.parentNode; event.target = originalEvent.target.parentNode;
// Add relatedTarget, if necessary // Add relatedTarget, if necessary
@ -401,7 +401,7 @@ jQuery.extend({
jQuery.readyList = null; jQuery.readyList = null;
} }
// Remove event listener to avoid memory leak // Remove event listener to avoid memory leak
if ( jQuery.browser.mozilla || jQuery.browser.opera ) if ( document.removeEventListener )
document.removeEventListener( "DOMContentLoaded", jQuery.ready, false ); document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
} }
} }
@ -424,14 +424,14 @@ function bindReady(){
if ( readyBound ) return; if ( readyBound ) return;
readyBound = true; readyBound = true;
// If Mozilla is used // Mozilla, Opera and webkit nightlies currently support this event
if ( jQuery.browser.mozilla || jQuery.browser.opera ) if ( document.addEventListener )
// Use the handy event callback // Use the handy event callback
document.addEventListener( "DOMContentLoaded", jQuery.ready, false ); document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
// If Safari or IE is used // If Safari or IE is used
// Continually check to see if the document is ready // Continually check to see if the document is ready
else (function(){ if (jQuery.browser.msie || jQuery.browser.safari ) (function(){
try { try {
// If IE is used, use the trick by Diego Perini // If IE is used, use the trick by Diego Perini
// http://javascript.nwbox.com/IEContentLoaded/ // http://javascript.nwbox.com/IEContentLoaded/