library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2025-01-10 18:24:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Ref #14313: Further code and test improvements

Browse Source
This commit is contained in:
Richard Gibson 2013-09-03 01:24:01 -04:00
parent c75c9a8ebb
commit f66d53c856
2 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core.js
View File

@ -552,15 +552,13 @@ jQuery.extend({
}, },
merge: function( first, second ) { merge: function( first, second ) {
var l = +second.length, var len = +second.length,
i = first.length, j = 0,
j = 0; i = first.length;
if ( l ) { for ( ; j < len; j++ ) {
for ( ; j < l; j++ ) {
first[ i++ ] = second[ j ]; first[ i++ ] = second[ j ];
} }
}
first.length = i; first.length = i;

64
test/unit/core.js
View File

@ -903,25 +903,65 @@ test("jQuery.map", function() {
}); });
test("jQuery.merge()", function() { test("jQuery.merge()", function() {
expect(8); expect( 10 );
deepEqual( jQuery.merge([],[]), [], "Empty arrays" ); deepEqual(
jQuery.merge( [], [] ),
[],
"Empty arrays"
);
deepEqual( jQuery.merge([ 1 ],[ 2 ]), [ 1, 2 ], "Basic" ); deepEqual(
deepEqual( jQuery.merge([ 1, 2 ], [ 3, 4 ]), [ 1, 2, 3, 4 ], "Basic" ); jQuery.merge( [ 1 ], [ 2 ] ),
[ 1, 2 ],
"Basic (single-element)"
);
deepEqual(
jQuery.merge( [ 1, 2 ], [ 3, 4 ] ),
[ 1, 2, 3, 4 ],
"Basic (multiple-element)"
);
deepEqual( jQuery.merge([ 1, 2 ],[]), [ 1, 2 ], "Second empty" ); deepEqual(
deepEqual( jQuery.merge([],[ 1, 2 ]), [ 1, 2 ], "First empty" ); jQuery.merge( [ 1, 2 ], [] ),
[ 1, 2 ],
"Second empty"
);
deepEqual(
jQuery.merge( [], [ 1, 2 ] ),
[ 1, 2 ],
"First empty"
);
// Fixed at [5998], #3641 // Fixed at [5998], #3641
deepEqual( jQuery.merge([ -2, -1 ], [ 0, 1, 2 ]), [ -2, -1 , 0, 1, 2 ], deepEqual(
"Second array including a zero (falsy)"); jQuery.merge( [ -2, -1 ], [ 0, 1, 2 ] ),
[ -2, -1 , 0, 1, 2 ],
"Second array including a zero (falsy)"
);
// After fixing #5527 // After fixing #5527
deepEqual( jQuery.merge([], [ null, undefined ]), [ null, undefined ], deepEqual(
"Second array including null and undefined values"); jQuery.merge( [], [ null, undefined ] ),
deepEqual( jQuery.merge({ length: 0 }, [ 1, 2 ] ), { length: 2, 0: 1, 1: 2}, [ null, undefined ],
"First array like"); "Second array including null and undefined values"
);
deepEqual(
jQuery.merge( { length: 0 }, [ 1, 2 ] ),
{ length: 2, 0: 1, 1: 2 },
"First array like"
);
deepEqual(
jQuery.merge( [ 1, 2 ], { length: 1, 0: 3 } ),
[ 1, 2, 3 ],
"Second array like"
);
deepEqual(
jQuery.merge( [], document.getElementById("lengthtest").getElementsByTagName("input") ),
[ document.getElementById("length"), document.getElementById("idTest") ],
"Second NodeList"
);
}); });
test("jQuery.extend(Object, Object)", function() { test("jQuery.extend(Object, Object)", function() {