Merge pull request aurelia#406 from Roustalski/feature/publish-router…

…-inner-resolve Publishes an inner instruction resolve
jwx · Jan 22, 2017 · b1282b7 · b1282b7
2 parents 90a4b1b + 59ca6ad
commit b1282b7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/app-router.js b/src/app-router.js
@@ -199,9 +199,9 @@ function processResult(instruction, result, instructionCount, router) {
 function resolveInstruction(instruction, result, isInnerInstruction, router) {
   instruction.resolve(result);
 
+  let eventArgs = { instruction, result };
   if (!isInnerInstruction) {
     router.isNavigating = false;
-    let eventArgs = { instruction, result };
     let eventName;
 
     if (result.output instanceof Error) {
@@ -216,6 +216,8 @@ function resolveInstruction(instruction, result, isInnerInstruction, router) {
 
     router.events.publish(`router:navigation:${eventName}`, eventArgs);
     router.events.publish('router:navigation:complete', eventArgs);
+  } else {
+    router.events.publish('router:navigation:child:complete', eventArgs);
   }
 
   return result;