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

jquery core: Closes #2827. jQuery.each iterates over functions

Browse source
This commit is contained in:
Ariel Flesler 2009-06-20 15:51:19 +00:00
parent ee34b6982a
commit c6b9654ea8
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core.js
View file

@ -307,10 +307,12 @@ jQuery.extend({
// args is for internal usage only // args is for internal usage only
each: function( object, callback, args ) { each: function( object, callback, args ) {
var name, i = 0, length = object.length; var name, i = 0,
length = object.length,
isObj = length === undefined || jQuery.isFunction(object);
if ( args ) { if ( args ) {
if ( length === undefined ) { if ( isObj ) {
for ( name in object ) { for ( name in object ) {
if ( callback.apply( object[ name ], args ) === false ) { if ( callback.apply( object[ name ], args ) === false ) {
break; break;
@ -326,7 +328,7 @@ jQuery.extend({
// A special, fast, case for the most common use of each // A special, fast, case for the most common use of each
} else { } else {
if ( length === undefined ) { if ( isObj ) {
for ( name in object ) { for ( name in object ) {
if ( callback.call( object[ name ], name, object[ name ] ) === false ) { if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
break; break;

9
test/unit/core.js
View file

@ -494,7 +494,7 @@ test("jQuery.extend(Object, Object)", function() {
}); });
test("jQuery.each(Object,Function)", function() { test("jQuery.each(Object,Function)", function() {
expect(12); expect(13);
jQuery.each( [0,1,2], function(i, n){ jQuery.each( [0,1,2], function(i, n){
equals( i, n, "Check array iteration" ); equals( i, n, "Check array iteration" );
}); });
@ -519,6 +519,13 @@ test("jQuery.each(Object,Function)", function() {
total = 0; total = 0;
jQuery.each({"a":3,"b":3,"c":3}, function(i,v){ total += v; return false; }); jQuery.each({"a":3,"b":3,"c":3}, function(i,v){ total += v; return false; });
equals( total, 3, "Looping over an object, with break" ); equals( total, 3, "Looping over an object, with break" );
var f = function(){};
f.foo = 'bar';
jQuery.each(f, function(i){
f[i] = 'baz';
});
equals( "baz", f.foo, "Loop over a function" );
}); });
test("jQuery.makeArray", function(){ test("jQuery.makeArray", function(){