feat($q): add shorthand for defining promise error handlers

Now we can instead this

    promise.then(null, errorHandler)

with this

    promise.catch(errorhandler)

Closes #2048
Closes #3476
This commit is contained in:
bolasblack 2013-08-06 17:48:32 +08:00 committed by Igor Minar
parent b3087421f2
commit a207665dad
2 changed files with 29 additions and 10 deletions

View file

@ -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)` 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
@ -128,25 +130,25 @@
* you can treat promises attached to a scope as if they were the resulting values.
* - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
* all the important functionality needed for common async tasks.
*
*
* # Testing
*
*
* <pre>
* it('should simulate promise', inject(function($q, $rootScope) {
* var deferred = $q.defer();
* var promise = deferred.promise;
* var resolvedValue;
*
*
* promise.then(function(value) { resolvedValue = value; });
* expect(resolvedValue).toBeUndefined();
*
*
* // Simulate resolving of promise
* deferred.resolve(123);
* // Note that the 'then' function does not get called synchronously.
* // This is because we want the promise API to always be async, whether or not
* // it got called synchronously or asynchronously.
* expect(resolvedValue).toBeUndefined();
*
*
* // Propagate promise resolution to 'then' functions using $apply().
* $rootScope.$apply();
* expect(resolvedValue).toEqual(123);
@ -267,8 +269,13 @@ function qFactory(nextTick, exceptionHandler) {
return result.promise;
},
"catch": function(callback) {
return this.then(null, callback);
},
always: function(callback) {
function makePromise(value, resolved) {
var result = defer();
if (resolved) {
@ -278,14 +285,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);
@ -296,7 +303,7 @@ function qFactory(nextTick, exceptionHandler) {
return makePromise(value, isResolved);
}
}
return this.then(function(value) {
return handleCallback(value, true);
}, function(error) {

View file

@ -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');
});
@ -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)');
});
});
});
});