mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-08-02 21:52:19 +00:00
(js/css) Update generated files
This commit is contained in:
+5
-3
@@ -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
|
||||
*/
|
||||
@@ -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
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user