Changeset 12828

Timestamp:

03/03/08 04:13:09 (9 months ago)

Author:

alex

Message:

comment cleanup and code shortening. Also expanding test cases to handle default param packing. Refs #3961. Refs #5962. Refs #3121. !strict

Location:

dojo/trunk

Files:

• tests/_base/Deferred.js (modified) (1 diff)
• _base/Deferred.js (modified) (3 diffs)

dojo/trunk/tests/_base/Deferred.js

@@ -19 +19 @@
                         // t.debug("cnt:", cnt);
                         t.assertEqual(cnt, 5);
+                },
+
+                function callback_extra_args(t){
+                        var nd = new dojo.Deferred();
+                        var cnt = 0;
+                        nd.addCallback(window, function(base, res){ cnt+=base; cnt+=res; return cnt; }, 30);
+                        nd.callback(5);
+                        t.assertEqual(cnt, 35);
                 },
 

dojo/trunk/_base/Deferred.js

@@ -301 +301 @@
 
         callback: function(res){
-                // summary:     Begin the callback sequence with a non-error value.
+                //      summary:        
+                //              Begin the callback sequence with a non-error value.
                 
                 /*
@@ -312 +313 @@
 
         errback: function(/*Error*/res){
-                // summary: 
+                //      summary: 
                 //              Begin the callback sequence with an error result.
                 this._check();
@@ -321 +322 @@
         },
 
-        addBoth: function(/*Function||Object*/cb, /*Optional, String*/cbfn){
-                // summary:
+        addBoth: function(/*Function|Object*/cb, /*String?*/cbfn){
+                //      summary:
                 //              Add the same function as both a callback and an errback as the
-                //              next element on the callback sequence.  This is useful for code
+                //              next element on the callback sequence.This is useful for code
                 //              that you want to guarantee to run, e.g. a finalizer.
-                var enclosed = dojo.hitch(cb, cbfn);
-                if(arguments.length > 2){
-                        enclosed = dojo.partial(enclosed, arguments, 2);
-                }
+                var enclosed = dojo.hitch.apply(dojo, arguments);
                 return this.addCallbacks(enclosed, enclosed);
         },
 
-        addCallback: function(cb, cbfn){
-                // summary: 
+        addCallback: function(/*Function|Object*/cb, /*String?*/cbfn /*...*/){
+                //      summary: 
                 //              Add a single callback to the end of the callback sequence.
-                var enclosed = dojo.hitch(cb, cbfn);
-                if(arguments.length > 2){
-                        enclosed = dojo.partial(enclosed, arguments, 2);
-                }
-                return this.addCallbacks(enclosed, null);
+                return this.addCallbacks(dojo.hitch.apply(dojo, arguments));
         },
 
         addErrback: function(cb, cbfn){
-                // summary: 
+                //      summary: 
                 //              Add a single callback to the end of the callback sequence.
-                var enclosed = dojo.hitch(cb, cbfn);
-                if(arguments.length > 2){
-                        enclosed = dojo.partial(enclosed, arguments, 2);
-                }
-                return this.addCallbacks(null, enclosed);
+                return this.addCallbacks(null, dojo.hitch.apply(dojo, arguments));
         },