Changeset 4447

Timestamp:

01/14/08 20:06:34 (6 months ago)

Author:

jeresig

Message:

Added support for breaking in an object loop (Bug #2111).

Location:

trunk/jquery

Files:

• src/core.js (modified) (2 diffs)
• test/unit/core.js (modified) (2 diffs)

trunk/jquery/src/core.js

@@ -708 +708 @@
     each: function( object, callback, args ) {
         if ( args ) {
-            if ( object.length == undefined )
+            if ( object.length == undefined ) {
                 for ( var name in object )
-                    callback.apply( object[ name ], args );
-            else
+                    if ( callback.apply( object[ name ], args ) === false )
+                        break;
+            } else
                 for ( var i = 0, length = object.length; i < length; i++ )
                     if ( callback.apply( object[ i ], args ) === false )
@@ -718 +719 @@
         // A special, fast, case for the most common use of each
         } else {
-            if ( object.length == undefined )
+            if ( object.length == undefined ) {
                 for ( var name in object )
-                    callback.call( object[ name ], name, object[ name ] );
-            else
+                    if ( callback.call( object[ name ], name, object[ name ] ) === false )
+                        break;
+            } else
                 for ( var i = 0, length = object.length, value = object[0]; 
                     i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}

trunk/jquery/test/unit/core.js

@@ -1315 +1315 @@
 
 test("$.each(Object,Function)", function() {
-    expect(8);
+    expect(12);
     $.each( [0,1,2], function(i, n){
         ok( i == n, "Check array iteration" );
@@ -1327 +1327 @@
         ok( i == n, "Check object iteration" );
     });
+
+        var total = 0;
+        jQuery.each([1,2,3], function(i,v){ total += v; });
+        ok( total == 6, "Looping over an array" );
+        total = 0;
+        jQuery.each([1,2,3], function(i,v){ total += v; if ( i == 1 ) return false; });
+        ok( total == 3, "Looping over an array, with break" );
+        total = 0;
+        jQuery.each({"a":1,"b":2,"c":3}, function(i,v){ total += v; });
+        ok( total == 6, "Looping over an object" );
+        total = 0;
+        jQuery.each({"a":3,"b":3,"c":3}, function(i,v){ total += v; return false; });
+        ok( total == 3, "Looping over an object, with break" );
 });