X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=c9076b682d9a6a6b2c9c3494f47ae9af319f9d54;hb=ba48be3ada51aee683ce5992c5f00a8458f385f8;hp=6accbc4663b2bcfd50f3fc9e3dfbb90cde08624b;hpb=eeab07179038a6a444e4b819f942663157768dfb;p=jquery.git diff --git a/src/core.js b/src/core.js index 6accbc4..c9076b6 100644 --- a/src/core.js +++ b/src/core.js @@ -1138,16 +1138,16 @@ jQuery.extend({ merge: function( first, second ) { // We have to loop this way because IE & Opera overwrite the length // expando of getElementsByTagName - + var i = 0; // 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++ ) + for ( ; second[ i ]; i++ ) if ( second[ i ].nodeType != 8 ) first.push( second[ i ] ); } else - for ( var i = 0; second[ i ]; i++ ) + for ( ; second[ i ]; i++ ) first.push( second[ i ] ); return first; @@ -1194,15 +1194,11 @@ jQuery.extend({ for ( var i = 0, length = elems.length; i < length; i++ ) { var value = callback( elems[ i ], i ); - if ( value !== null && value != undefined ) { - if ( value.constructor != Array ) - value = [ value ]; - - ret = ret.concat( value ); - } + if ( value != null ) + ret[ ret.length ] = value; } - return ret; + return ret.concat.apply( [], ret ); } });