Complete overhaul of the Ajax test suite, it's now passing in all browsers. In order...

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

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 705a5bb..b7091e2 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -852,7 +852,7 @@ jQuery.fn = jQuery.prototype = {
         * @cat DOM/Manipulation
         */
        clone: function(deep) {
-               deep = deep != undefined ? deep : true
+               deep = deep != undefined ? deep : true;
                var $this = this.add(this.find("*"));
                if (jQuery.browser.msie) {
                        // Need to remove events on the element and its descendants
@@ -938,7 +938,7 @@ jQuery.fn = jQuery.prototype = {
                return this.pushStack(
                        jQuery.isFunction( t ) &&
                        jQuery.grep(this, function(el, index){
-                               return t.apply(el, [index])
+                               return t.apply(el, [index]);
                        }) ||
 
                        jQuery.multiFilter(t,this) );
@@ -1191,7 +1191,7 @@ jQuery.fn = jQuery.prototype = {
                                        if ( this.src )
                                                jQuery.ajax({ url: this.src, async: false, dataType: "script" });
                                        else
-                                               (new Function( this.text || this.textContent || this.innerHTML || "" ))();
+                                               jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
                                } else
                                        fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
                        });
@@ -1252,17 +1252,33 @@ jQuery.fn = jQuery.prototype = {
  */
 jQuery.extend = jQuery.fn.extend = function() {
        // copy reference to target object
-       var target = arguments[0], a = 1;
+       var target = arguments[0] || {}, a = 1, al = arguments.length;
 
        // extend jQuery itself if only one argument is passed
-       if ( arguments.length == 1 ) {
+       if ( al == 1 ) {
                target = this;
                a = 0;
        }
+
        var prop;
-       while ( (prop = arguments[a++]) != null )
-               // Extend the base object
-               for ( var i in prop ) target[i] = prop[i];
+
+       for ( ; a < al; a++ )
+               // Only deal with non-null/undefined values
+               if ( (prop = arguments[a]) != null )
+                       // Extend the base object
+                       for ( var i in prop ) {
+                               // Prevent never-ending loop
+                               if ( target == prop[i] )
+                                       continue;
+
+                               // Recurse if we're merging object values
+                               if ( typeof prop[i] == 'object' && target[i] )
+                                       jQuery.extend( target[i], prop[i] );
+
+                               // Don't bring in undefined values
+                               else if ( prop[i] != undefined )
+                                       target[i] = prop[i];
+                       }
 
        // Return the modified object
        return target;
@@ -1322,6 +1338,21 @@ jQuery.extend({
                        elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
        },
 
+       // Evalulates a script in a global context
+       // Evaluates Async. in Safari 2 :-(
+       globalEval: function( data ) {
+               data = jQuery.trim( data );
+               if ( data ) {
+                       if ( window.execScript )
+                               window.execScript( data );
+                       else if ( jQuery.browser.safari )
+                               // safari doesn't provide a synchronous global eval
+                               window.setTimeout( data, 0 );
+                       else
+                               eval.call( window, data );
+               }
+       },
+
        nodeName: function( elem, name ) {
                return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
        },
@@ -1494,7 +1525,7 @@ jQuery.extend({
                        // then some display: none elements are involved
                        else {
                                // Locate all of the parent display: none elements
-                               for ( var a = elem; color(a); a = a.parentNode )
+                               for ( var a = elem; a && color(a); a = a.parentNode )
                                        stack.unshift(a);
 
                                // Go through and make them visible, but in reverse
@@ -1551,7 +1582,7 @@ jQuery.extend({
                                        !s.indexOf("<leg") &&
                                        [1, "<fieldset>", "</fieldset>"] ||
                                        
-                                       (!s.indexOf("<thead") || !s.indexOf("<tbody") || !s.indexOf("<tfoot") || !s.indexOf("<colg")) &&
+                                       s.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
                                        [1, "<table>", "</table>"] ||
                                        
                                        !s.indexOf("<tr") &&
@@ -1562,7 +1593,11 @@ jQuery.extend({
                                        [3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
                                        
                                        !s.indexOf("<col") &&
-                                       [2, "<table><colgroup>", "</colgroup></table>"] ||
+                                       [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"] ||
+
+                                       // IE can't serialize <link> and <script> tags normally
+                                       jQuery.browser.msie &&
+                                       [1, "div<div>", "</div>"] ||
                                        
                                        [0,"",""];
 
@@ -1571,7 +1606,7 @@ jQuery.extend({
                                
                                // Move to the right depth
                                while ( wrap[0]-- )
-                                       div = div.firstChild;
+                                       div = div.lastChild;
                                
                                // Remove IE's autoinserted <tbody> from table fragments
                                if ( jQuery.browser.msie ) {
@@ -1587,7 +1622,11 @@ jQuery.extend({
                                        for ( var n = tb.length-1; n >= 0 ; --n )
                                                if ( jQuery.nodeName(tb[n], "tbody") && !tb[n].childNodes.length )
                                                        tb[n].parentNode.removeChild(tb[n]);
-                                       
+       
+                                       // IE completely kills leading whitespace when innerHTML is used        
+                                       if ( /^\s/.test(arg) )  
+                                               div.insertBefore( doc.createTextNode( arg.match(/^\s*/)[0] ), div.firstChild );
+
                                }
                                
                                arg = jQuery.makeArray( div.childNodes );
@@ -1706,8 +1745,17 @@ jQuery.extend({
        merge: function(first, second) {
                // We have to loop this way because IE & Opera overwrite the length
                // expando of getElementsByTagName
-               for ( var i = 0; second[i]; i++ )
-                       first.push(second[i]);
+
+               // Also, we need to make sure that the correct elements are being returned
+               // (IE returns comment nodes in a '*' query)
+               if ( jQuery.browser.msie ) {
+                       for ( var i = 0; second[i]; i++ )
+                               if ( second[i].nodeType != 8 )
+                                       first.push(second[i]);
+               } else
+                       for ( var i = 0; second[i]; i++ )
+                               first.push(second[i]);
+
                return first;
        },
 
@@ -1885,7 +1933,7 @@ new function() {
        // Check to see if the W3C box model is being used
        jQuery.boxModel = !jQuery.browser.msie || document.compatMode == "CSS1Compat";
 
-       jQuery.styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat",
+       jQuery.styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat";
 
        jQuery.props = {
                "for": "htmlFor",
@@ -2054,7 +2102,7 @@ jQuery.each({
                var ret = jQuery.map(this,n);
                if ( a && typeof a == "string" )
                        ret = jQuery.multiFilter(a,ret);
-               return this.pushStack( ret );
+               return this.pushStack( jQuery.unique(ret) );
        };
 });