X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=c17d6248bc9bf1dc9daa30d00e6174cde3d23c66;hb=ddd110c9e583fb43257ae1b9b06223bdc7e21f31;hp=3816296a81107268ec17fb97eb3b4aac25ef2e51;hpb=4bcb578c794acd913ec1f42793ce4b1a7388025c;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 3816296..c17d624 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1565,10 +1565,13 @@ jQuery.extend({ // Go to html and back, then peel off extra wrappers div.innerHTML = wrap[1] + s + wrap[2]; while ( wrap[0]-- ) div = div.firstChild; - arg = div.childNodes; - } - - if ( arg.length != undefined && !arg.nodeType ) // Handles Array, jQuery, DOM NodeList collections + + // Have to loop through the childNodes here to + // prevent a Safari crash with text nodes and /n characters + for ( var j = 0; j < div.childNodes.length; j++ ) + r.push( div.childNodes[j] ); + } + else if ( arg.length != undefined && !arg.nodeType ) // Handles Array, jQuery, DOM NodeList collections for ( var n = 0; n < arg.length; n++ ) r.push(arg[n]); else @@ -2268,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; @@ -2288,23 +2291,39 @@ 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) { - if ( event ) { + // check IE + if(jQuery.browser.msie) { + // 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 + event = jQuery.extend({}, event); + // 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; } - } }); @@ -3083,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
] *