]> source.dussan.org Git - jquery.git/commitdiff
Fix jQuery.clean to work with Safari and DOM NodeLists
authorBrandon Aaron <brandon.aaron@gmail.com>
Thu, 2 Nov 2006 18:53:40 +0000 (18:53 +0000)
committerBrandon Aaron <brandon.aaron@gmail.com>
Thu, 2 Nov 2006 18:53:40 +0000 (18:53 +0000)
src/jquery/jquery.js

index c17d6248bc9bf1dc9daa30d00e6174cde3d23c66..996ace8664eafa837c71b1ce382e6eace1deaca0 100644 (file)
@@ -1565,14 +1565,12 @@ 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;
-                               
-                               // 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] );
+                               arg = div.childNodes;
                        } 
-                       else if ( arg.length != undefined && !arg.nodeType ) // Handles Array, jQuery, DOM NodeList collections
-                               for ( var n = 0; n < arg.length; n++ )
+                       
+                       
+                       if ( arg.length != undefined && ( (jQuery.browser.safari && typeof arg == 'function') || !arg.nodeType ) ) // Safari reports typeof on a DOM NodeList to be a function
+                               for ( var n = 0; n < arg.length; n++ ) // Handles Array, jQuery, DOM NodeList collections
                                        r.push(arg[n]);
                        else
                                r.push( arg.nodeType ? arg : document.createTextNode(arg.toString()) );