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

Merge branch 'map-object.1.6' of https://github.com/danheberden/jquery into danheberden-map-object.1.6

Browse source
This commit is contained in:
jeresig 2011-04-10 16:46:14 -04:00
commit 247363b9a7
2 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/core.js
View file

@ -710,15 +710,30 @@ jQuery.extend({
// arg is for internal usage only
map: function( elems, callback, arg ) {
var ret = [], value;
var value, key, ret = [],
i = 0,
length = elems.length,
// jquery objects are treated as arrays
isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || jQuery.isArray( elems ) ) ;
// Go through the array, translating each of the items to their
// new value (or values).
for ( var i = 0, length = elems.length; i < length; i++ ) {
value = callback( elems[ i ], i, arg );
if ( isArray ) {
for ( ; i < length; i++ ) {
value = callback( elems[ i ], i, arg );
if ( value != null ) {
ret[ ret.length ] = value;
if ( value != null ) {
ret[ ret.length ] = value;
}
}
// Go thorugh every key on the object,
} else {
for ( key in elems ) {
value = callback( elems[ key ], key, arg );
if ( value != null ) {
ret[ ret.length ] = value;
}
}
}