X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=c17d6248bc9bf1dc9daa30d00e6174cde3d23c66;hb=ddd110c9e583fb43257ae1b9b06223bdc7e21f31;hp=303350aaef4582893c22002ce03eeabe1948c019;hpb=24142f60314f916a3eef563553c3305d26112e08;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 303350a..c17d624 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1548,9 +1548,10 @@ jQuery.extend({ clean: function(a) { var r = []; for ( var i = 0; i < a.length; i++ ) { - if ( a[i].constructor == String ) { // Convert html string into DOM nodes + var arg = a[i]; + if ( arg.constructor == String ) { // Convert html string into DOM nodes // Trim whitespace, otherwise indexOf won't work as expected - var s = jQuery.trim(a[i]), div = document.createElement("div"), wrap = [0,"",""]; + var s = jQuery.trim(arg), div = document.createElement("div"), wrap = [0,"",""]; if ( !s.indexOf("", ""]; @@ -1564,14 +1565,17 @@ 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; - a[i] = div.childNodes; - } - - if ( a[i].length != undefined && !a[i].nodeType ) // Handles Array, jQuery, DOM NodeList collections - for ( var n=0; n < a[i].length; n++ ) - r.push(a[i][n]); - else if ( a[i] !== null ) - r.push( a[i].nodeType ? a[i] : document.createTextNode(a[i].toString()) ); + + // 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 + r.push( arg.nodeType ? arg : document.createTextNode(arg.toString()) ); } return r; @@ -2267,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; @@ -2287,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; } - } }); @@ -3082,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
] *