Fix for passing jQuery constructor a DOM NodeList in Safari and an object or embed...

[jquery.git] / src / jquery / jquery.js

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 03db89c..aa2582a 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -31,7 +31,7 @@ window.undefined = window.undefined;
 var jQuery = function(a,c) {
 
        // Shortcut for document ready (because $(document).each() is silly)
-       if ( a && typeof a == "function" && jQuery.fn.ready )
+       if ( a && typeof a == "function" && jQuery.fn.ready && !a.nodeType && a[0] == undefined ) // Safari reports typeof on DOM NodeLists as a function
                return jQuery(document).ready(a);
 
        // Make sure that a selection was provided
@@ -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()) );
@@ -2271,7 +2269,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,16 +2289,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;
                                // 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
@@ -2308,16 +2308,20 @@ jQuery.extend({
                                // get parentnode from textnode
                                event.target = event.target.parentNode;
                        }
+                       
                        // fix preventDefault and stopPropagation
-                       event.preventDefault = function() {
-                               this.returnValue = false;
-                       };
-                       event.stopPropagation = function() {
-                               this.cancelBubble = true;
-                       };
+                       if (!event.preventDefault)
+                               event.preventDefault = function() {
+                                       this.returnValue = false;
+                               };
+                               
+                       if (!event.stopPropagation)
+                               event.stopPropagation = function() {
+                                       this.cancelBubble = true;
+                               };
+                       
                        return event;
                }
-
        }
 });
 
@@ -3096,7 +3100,7 @@ jQuery.macros = {
                 *
                 * It only returns the immediately previous sibling, not all previous siblings.
                 *
-                * @example $("p").previous(".selected")
+                * @example $("p").prev(".selected")
                 * @before <div><span>Hello</span></div><p class="selected">Hello Again</p><p>And Again</p>
                 * @result [ <div><span>Hello</span></div> ]
                 *