Query now throws no warnings under strict mode in Firefox (ticket #922). In fixing...

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

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index ddb08a4..d04aa61 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -840,7 +840,7 @@ jQuery.fn = jQuery.prototype = {
         */
        clone: function(deep) {
                return this.pushStack( jQuery.map( this, function(a){
-                       var a = a.cloneNode( deep != undefined ? deep : true );
+                       a = a.cloneNode( deep != undefined ? deep : true );
                        a.$events = null; // drop $events expando to avoid firing incorrect events
                        return a;
                }) );
@@ -1199,8 +1199,7 @@ 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;
 
        // extend jQuery itself if only one argument is passed
        if ( arguments.length == 1 ) {
@@ -1208,7 +1207,7 @@ jQuery.extend = jQuery.fn.extend = function() {
                a = 0;
        }
        var prop;
-       while (prop = arguments[a++])
+       while ( (prop = arguments[a++]) != null )
                // Extend the base object
                for ( var i in prop ) target[i] = prop[i];
 
@@ -1373,7 +1372,7 @@ jQuery.extend({
                        });
 
                        jQuery.swap( e, old, function() {
-                               if (jQuery.css(e,"display") != "none") {
+                               if ( jQuery(e).is(':visible') ) {
                                        oHeight = e.offsetHeight;
                                        oWidth = e.offsetWidth;
                                } else {
@@ -1383,14 +1382,14 @@ jQuery.extend({
                                                        visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
                                                }).appendTo(e.parentNode)[0];
 
-                                       var parPos = jQuery.css(e.parentNode,"position");
-                                       if ( parPos == "" || parPos == "static" )
+                                       var parPos = jQuery.css(e.parentNode,"position") || "static";
+                                       if ( parPos == "static" )
                                                e.parentNode.style.position = "relative";
 
                                        oHeight = e.clientHeight;
                                        oWidth = e.clientWidth;
 
-                                       if ( parPos == "" || parPos == "static" )
+                                       if ( parPos == "static" )
                                                e.parentNode.style.position = "static";
 
                                        e.parentNode.removeChild(e);
@@ -1456,13 +1455,16 @@ jQuery.extend({
                         // Convert html string into DOM nodes
                        if ( typeof arg == "string" ) {
                                // Trim whitespace, otherwise indexOf won't work as expected
-                               var s = jQuery.trim(arg), div = doc.createElement("div"), tb = [];
+                               var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = [];
 
                                var wrap =
                                         // option or optgroup
                                        !s.indexOf("<opt") &&
                                        [1, "<select>", "</select>"] ||
                                        
+                                       !s.indexOf("<leg") &&
+                                       [1, "<fieldset>", "</fieldset>"] ||
+                                       
                                        (!s.indexOf("<thead") || !s.indexOf("<tbody") || !s.indexOf("<tfoot")) &&
                                        [1, "<table>", "</table>"] ||
                                        
@@ -1502,10 +1504,10 @@ jQuery.extend({
                                arg = jQuery.makeArray( div.childNodes );
                        }
 
-                       if ( arg.length === 0 && !jQuery.nodeName(arg, "form") )
+                       if ( 0 === arg.length && !jQuery(arg).is("form, select") )
                                return;
-                       
-                       if ( arg[0] == undefined || jQuery.nodeName(arg, "form") )
+
+                       if ( arg[0] == undefined || jQuery(arg).is("form, select") )
                                r.push( arg );
                        else
                                r = jQuery.merge( r, arg );
@@ -1637,7 +1639,7 @@ jQuery.extend({
                var r = [], num = jQuery.mergeNum++;
 
                for ( var i = 0, fl = first.length; i < fl; i++ )
-                       if ( first[i].mergeNum != num ) {
+                       if ( num != first[i].mergeNum ) {
                                first[i].mergeNum = num;
                                r.push(first[i]);
                        }
@@ -1781,6 +1783,7 @@ new function() {
 
        // Figure out what browser is being used
        jQuery.browser = {
+               version: b.match(/.+[xiae][\/ ]([\d.]+)/)[1],
                safari: /webkit/.test(b),
                opera: /opera/.test(b),
                msie: /msie/.test(b) && !/opera/.test(b),