Refactored pulled changes and bumped version

sudhirj · Oct 17, 2013 · 8efd5a9 · 8efd5a9
1 parent a5a7213
commit 8efd5a9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 26 deletions.
diff --git a/deferred.coffee b/deferred.coffee
@@ -5,7 +5,7 @@
 # ####[Source (github)](http://github.com/sudhirj/simply-deferred) | [Documentation](https://github.com/sudhirj/simply-deferred#simply-deferred)
 # &copy; Sudhir Jonathan [sudhirjonathan.com](http://www.sudhirjonathan.com)
 
-VERSION = '2.3.0'
+VERSION = '2.4.0'
 
 # First, let's set up the constants that we'll need to signify the state of the `deferred` object. These will be returned from the `state()` method.
 
@@ -83,16 +83,10 @@ Deferred = ->
       master = new Deferred()
 
       filter = (source, funnel, callback) ->
-        if callback?
-          candidate[source]((args...) ->
-            value = callback(args...)
-            if isPromise(value)
-              value.done(master.resolve).fail(master.reject)
-            else
-              master[funnel](value)
-          )
-        else
-          candidate[source](master[funnel])
+        if not callback then return candidate[source](master[funnel])
+        candidate[source] (args...) ->
+          value = callback(args...)
+          if isPromise(value) then value.done(master.resolve).fail(master.reject) else master[funnel](value)
 
       filter('done', 'resolve', doneFilter)
       filter('fail', 'reject', failFilter)

diff --git a/deferred.js b/deferred.js
diff --git a/deferred.min.js b/deferred.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Sudhir Jonathan <contact.me@sudhirjonathan.com> (http://www.sudhirjonathan.com)",
   "name": "simply-deferred",
   "description": "A deferred library for Node.js and the browser with a simplified jQuery compatible API",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "homepage": "http://sudhirj.github.com/simply-deferred/",
   "repository": {
     "type": "git",