X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=c17d6248bc9bf1dc9daa30d00e6174cde3d23c66;hb=ddd110c9e583fb43257ae1b9b06223bdc7e21f31;hp=287cd641328c0b9338ebef4d4f45c5059c58e2d6;hpb=4e5b46f7f624b119633390385560e09ab3d38fa8;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 287cd64..c17d624 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -2271,7 +2271,7 @@ jQuery.extend({ handle: function(event) { if ( typeof jQuery == "undefined" ) return false; - event = event || jQuery.event.fix( window.event ); + event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data // If no correct event was found, fail if ( !event ) return false; @@ -2291,22 +2291,18 @@ jQuery.extend({ } } + // Clean up added properties in IE to prevent memory leak + if (jQuery.browser.msie) event.target = event.preventDefault = event.stopPropagation = null; + return returnValue; }, fix: function(event) { // check IE if(jQuery.browser.msie) { - // get real event from window.event - event = window.event; - event.preventDefault = function() { - this.returnValue = false; - }; - event.stopPropagation = function() { - this.cancelBubble = true; - }; // fix target property event.target = event.srcElement; + // check safari and if target is a textnode } else if(jQuery.browser.safari && event.target.nodeType == 3) { // target is readonly, clone the event object @@ -2314,9 +2310,20 @@ jQuery.extend({ // get parentnode from textnode event.target = event.target.parentNode; } + + // fix preventDefault and stopPropagation + if (!event.preventDefault) + event.preventDefault = function() { + this.returnValue = false; + }; + + if (!event.stopPropagation) + event.stopPropagation = function() { + this.cancelBubble = true; + }; + return event; } - } }); @@ -3095,7 +3102,7 @@ jQuery.macros = { * * It only returns the immediately previous sibling, not all previous siblings. * - * @example $("p").previous(".selected") + * @example $("p").prev(".selected") * @before
Hello

Hello Again

And Again

* @result [
Hello
] *