[Pkg-javascript-commits] [node-async] 293/480: Merge pull request #235 from leahciMic/async_auto_error_receives_partial_results

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository node-async.

commit d321d633d10f2b04d25edd702f9db7614a9cff59
Merge: b63b80a 12bce1d
Author: Caolan McMahon <caolan at caolanmcmahon.com>
Date:   Sat Mar 2 13:02:20 2013 -0800

    Merge pull request #235 from leahciMic/async_auto_error_receives_partial_results
    
    Send results to auto callback when an error occurs

 README.md          |  6 ++++--
 lib/async.js       | 15 ++++++++++-----
 test/test-async.js | 20 ++++++++++++++++++++
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --cc README.md
index f7f0164,6a2bae2..2535cf8
--- a/README.md
+++ b/README.md
@@@ -980,14 -974,14 +980,16 @@@ __Arguments_
  
  * tasks - An object literal containing named functions or an array of
    requirements, with the function itself the last item in the array. The key
 -  used for each function or array is used when specifying requirements. The
 -  syntax is easier to understand by looking at the example.
 +  used for each function or array is used when specifying requirements. The 
 +  function takes as an argument a callback(err, result) which must be called 
 +  when finished, passing an error (which can be null) and the result of the
 +  function's execution. 
  * callback(err, results) - An optional callback which is called when all the
    tasks have been completed. The callback will receive an error as an argument
-   if any tasks pass an error to their callback. If all tasks complete
-   successfully, it will receive an object containing their results.
+   if any tasks pass an error to their callback. Results will always be passed
+ 	but if an error occurred, no other tasks will be performed, and the results
+ 	object will only contain partial results.
+   
  
  __Example__
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-async.git