Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit e23c606

Browse files
committed
perf($q): reduce closures when resolving promises
- changes Deferred.$$resolve to only wrap the internal resolve/reject when wrapping another promise
1 parent aff74ec commit e23c606

File tree

1 file changed

+33
-24
lines changed

1 file changed

+33
-24
lines changed

src/ng/q.js

+33-24
Original file line numberDiff line numberDiff line change
@@ -243,18 +243,6 @@ function $$QProvider() {
243243
*/
244244
function qFactory(nextTick, exceptionHandler) {
245245
var $qMinErr = minErr('$q', TypeError);
246-
function callOnce(self, resolveFn, rejectFn) {
247-
var called = false;
248-
function wrap(fn) {
249-
return function(value) {
250-
if (called) return;
251-
called = true;
252-
fn.call(self, value);
253-
};
254-
}
255-
256-
return [wrap(resolveFn), wrap(rejectFn)];
257-
}
258246

259247
/**
260248
* @ngdoc method
@@ -361,21 +349,42 @@ function qFactory(nextTick, exceptionHandler) {
361349
},
362350

363351
$$resolve: function(val) {
364-
var then, fns;
352+
var then;
353+
try {
354+
then = (isObject(val) || isFunction(val)) && isFunction(then = val.then) ? then : false;
355+
} catch (e) {
356+
this.$$reject(e);
357+
exceptionHandler(e);
358+
return;
359+
}
365360

366-
fns = callOnce(this, this.$$resolve, this.$$reject);
361+
if (then) {
362+
this.promise.$$state.status = -1;
363+
this.$$delayResolve(val, then);
364+
} else {
365+
this.promise.$$state.value = val;
366+
this.promise.$$state.status = 1;
367+
scheduleProcessQueue(this.promise.$$state);
368+
}
369+
},
370+
371+
$$delayResolve: function(promiseLike, then) {
372+
var that = this;
373+
var done = false;
374+
function resolvePromise(val) {
375+
if (done) return;
376+
done = true;
377+
that.$$resolve(val);
378+
}
379+
function rejectPromise(val) {
380+
if (done) return;
381+
done = true;
382+
that.$$reject(val);
383+
}
367384
try {
368-
if ((isObject(val) || isFunction(val))) then = val && val.then;
369-
if (isFunction(then)) {
370-
this.promise.$$state.status = -1;
371-
then.call(val, fns[0], fns[1], this.notify);
372-
} else {
373-
this.promise.$$state.value = val;
374-
this.promise.$$state.status = 1;
375-
scheduleProcessQueue(this.promise.$$state);
376-
}
385+
then.call(promiseLike, resolvePromise, rejectPromise, this.notify);
377386
} catch (e) {
378-
fns[1](e);
387+
rejectPromise(e);
379388
exceptionHandler(e);
380389
}
381390
},

0 commit comments

Comments
 (0)