Skip to content

Commit

Permalink
feat($q): add shorthand for defining promise error handlers
Browse files Browse the repository at this point in the history
Now we can instead this

    promise.then(null, errorHandler)

with this

    promise.catch(errorhandler)

Closes angular#2048
  • Loading branch information
bolasblack committed Aug 9, 2013
1 parent 285f6b4 commit 880b6e1
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
14 changes: 9 additions & 5 deletions src/ng/q.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
* This method *returns a new promise* which is resolved or rejected via the return value of the
* `successCallback` or `errorCallback`.
*
* - `catch(errorCallback)` – it is shorthand for `promise.then(null, errorCallback)`
*
* - `always(callback)` – allows you to observe either the fulfillment or rejection of a promise,
* but to do so without modifying the final value. This is useful to release resources or do some
* clean-up that needs to be done whether the promise was rejected or resolved. See the [full
Expand Down Expand Up @@ -230,6 +232,9 @@ function qFactory(nextTick, exceptionHandler) {


promise: {
"catch": function(callback) {
return this.then(null, callback);
},
then: function(callback, errback, progressback) {
var result = defer();

Expand Down Expand Up @@ -268,7 +273,6 @@ function qFactory(nextTick, exceptionHandler) {
return result.promise;
},
always: function(callback) {

function makePromise(value, resolved) {
var result = defer();
if (resolved) {
Expand All @@ -278,14 +282,14 @@ function qFactory(nextTick, exceptionHandler) {
}
return result.promise;
}

function handleCallback(value, isResolved) {
var callbackOutput = null;
var callbackOutput = null;
try {
callbackOutput = (callback ||defaultCallback)();
} catch(e) {
return makePromise(e, false);
}
}
if (callbackOutput && callbackOutput.then) {
return callbackOutput.then(function() {
return makePromise(value, isResolved);
Expand All @@ -296,7 +300,7 @@ function qFactory(nextTick, exceptionHandler) {
return makePromise(value, isResolved);
}
}

return this.then(function(value) {
return handleCallback(value, true);
}, function(error) {
Expand Down
12 changes: 12 additions & 0 deletions test/ng/qSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,10 @@ describe('q', function() {
expect(typeof promise.then).toBe('function');
});

it('should have a catch method', function() {
expect(typeof promise['catch']).toBe('function');
});

it('should have a always method', function() {
expect(typeof promise.always).toBe('function');
});
Expand Down Expand Up @@ -881,6 +885,14 @@ describe('q', function() {

});
});

describe('catch', function() {
it('should be a shorthand for defining promise error handlers', function() {
promise['catch'](error(1)).then(null, error(2))
syncReject(deferred, 'foo');
expect(logStr()).toBe('error1(foo)->reject(foo); error2(foo)->reject(foo)');
});
});
});
});

Expand Down

0 comments on commit 880b6e1

Please sign in to comment.