deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rewrote .merge() (faster and less obtuse now). Fixed #5610.

Browse source
This commit is contained in:
John Resig 2009-12-09 21:43:20 -08:00
parent f25eedf32a
commit 715d1c5a30
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core.js
View file

@ -567,22 +567,19 @@ jQuery.extend({
},
merge: function( first, second ) {
var pos, i = second.length;
var i = first.length, j = 0;
// We have to get length this way when IE & Opera overwrite the length
// expando of getElementsByTagName
if ( i && i.nodeType ) {
for ( i = 0; second[i]; ++i ) {}
if ( typeof second.length === "number" ) {
for ( var l = second.length; j < l; j++ ) {
first[ i++ ] = second[ j ];
}
} else {
while ( second[j] !== undefined ) {
first[ i++ ] = second[ j++ ];
}
}
pos = i + first.length;
// Correct length for non Arrays
first.length = pos;
while ( i ) {
first[ --pos ] = second[ --i ];
}
first.length = i;
return first;
},

6
test/unit/core.js
View file

@ -711,7 +711,7 @@ test("jQuery.each(Object,Function)", function() {
});
test("jQuery.makeArray", function(){
expect(15);
expect(17);
equals( jQuery.makeArray(jQuery('html>*'))[0].nodeName.toUpperCase(), "HEAD", "Pass makeArray a jQuery object" );
@ -744,6 +744,10 @@ test("jQuery.makeArray", function(){
equals( jQuery.makeArray(/a/)[0].constructor, RegExp, "Pass makeArray a regex" );
ok( jQuery.makeArray(document.getElementById('form')).length >= 13, "Pass makeArray a form (treat as elements)" );
// For #5610
same( jQuery.makeArray({'length': '0'}), [], "Make sure object is coerced properly.");
same( jQuery.makeArray({'length': '5'}), [], "Make sure object is coerced properly.");
});
test("jQuery.isEmptyObject", function(){