Skip to content

Commit

Permalink
release 0.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen committed Jan 20, 2017
1 parent 80f4443 commit 326980b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
8 changes: 5 additions & 3 deletions release/angular-ui-router.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* State-based routing for AngularJS
* @version v0.4.0
* @version v0.4.1
* @link http://angular-ui.github.com/
* @license MIT License, http://www.opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -403,11 +403,13 @@ function $Resolve( $q, $injector) {
// To complete the overall resolution, we have to wait for the parent
// promise and for the promise for each invokable in our plan.
var resolution = $q.defer(),
result = resolution.promise,
result = silenceUncaughtInPromise(resolution.promise),
promises = result.$$promises = {},
values = extend({}, locals),
wait = 1 + plan.length/3,
merged = false;

silenceUncaughtInPromise(result);

function done() {
// Merge parent values we haven't got yet and publish our own $$values
Expand Down Expand Up @@ -487,7 +489,7 @@ function $Resolve( $q, $injector) {
}
}
// Publish promise synchronously; invocations further down in the plan may depend on it.
promises[key] = invocation.promise;
promises[key] = silenceUncaughtInPromise(invocation.promise);
}

return result;
Expand Down
Loading

0 comments on commit 326980b

Please sign in to comment.