Skip to content

Resolve with Deferred object returned #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
colelawrence wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Resolve with Deferred object returned #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92a5190
Resolve with Deferred object returned
Aug 8, 2014
febc5cc
Update promise.js
Aug 8, 2014
d385b81
Update promise.min.js
Aug 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions promise.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class Resolver
try
if value is @promise
throw new TypeError( 'A Promise cannot be resolved with itself.' )
if ( isObject( value ) or isFunction( value ) ) and isFunction( thenFn = value.then )
if ( isObject( value ) or isFunction( value ) ) and ( isFunction( thenFn = value.then ) or ( value instanceof Deferred and thenFn = value.promise.then ) )
isHandled = false
try
self = @
Expand Down Expand Up @@ -139,4 +139,4 @@ class Deferred

target = exports ? window
target.Deferred = Deferred
target.defer = -> new Deferred()
target.defer = -> new Deferred()
4 changes: 2 additions & 2 deletions promise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright (c) 2012-2013 [CodeCatalyst, LLC](http://www.codecatalyst.com/).
* Open source under the [MIT License](http://en.wikipedia.org/wiki/MIT_License).
*/
// Generated by CoffeeScript 1.6.3
// Generated by CoffeeScript 1.7.1
(function() {
var CallbackQueue, Consequence, Deferred, Promise, Resolver, callbackQueue, enqueue, isFunction, isObject, nextTick, target;

Expand Down Expand Up @@ -119,7 +119,7 @@
if (value === this.promise) {
throw new TypeError('A Promise cannot be resolved with itself.');
}
if ((isObject(value) || isFunction(value)) && isFunction(thenFn = value.then)) {
if ((isObject(value) || isFunction(value)) && (isFunction(thenFn = value.then) || (value instanceof Deferred && (thenFn = value.promise.then)))) {
isHandled = false;
try {
self = this;
Expand Down
6 changes: 1 addition & 5 deletions promise.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.