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 303350a..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
@@ -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("<opt") ) // option or optgroup
                                        wrap = [1, "<select>", "</select>"];
@@ -1564,14 +1565,15 @@ 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()) );
+                               arg = div.childNodes;
+                       } 
+                       
+                       
+                       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()) );
                }
 
                return r;
@@ -2267,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;
@@ -2287,23 +2289,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 +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> ]
                 *