Ensure child router afterDispose middleware is called when parent navigates

caseyWebb · caseyWebb · commit a57f348435a0 · 2017-01-05T17:04:47.000-06:00
diff --git a/src/router.js b/src/router.js
@@ -146,7 +146,7 @@ class Router {
   dispose() {
     document.removeEventListener(events.click, this.onclick, false)
     window.removeEventListener(events.popstate, this.onpopstate, false)
-    Router.unlink(this)
+    Router.unlink()
     if (this.isRoot) {
       this.ctx.route.runBeforeDispose().then(() => this.ctx.route.runAfterDispose())
     }
@@ -200,11 +200,8 @@ class Router {
     }
   }
 
-  static unlink(router) {
+  static unlink() {
     routers.pop()
-    if (!router.isRoot) {
-      delete router.$parent.$child
-    }
   }
 
   static onclick(e) {

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ class Router {`
`146`	`146`	`dispose() {`
`147`	`147`	`document.removeEventListener(events.click, this.onclick, false)`
`148`	`148`	`window.removeEventListener(events.popstate, this.onpopstate, false)`
`149`		`- Router.unlink(this)`
	`149`	`+ Router.unlink()`
`150`	`150`	`if (this.isRoot) {`
`151`	`151`	`this.ctx.route.runBeforeDispose().then(() => this.ctx.route.runAfterDispose())`
`152`	`152`	`}`
`@@ -200,11 +200,8 @@ class Router {`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`203`		`- static unlink(router) {`
	`203`	`+ static unlink() {`
`204`	`204`	`routers.pop()`
`205`		`- if (!router.isRoot) {`
`206`		`- delete router.$parent.$child`
`207`		`- }`
`208`	`205`	`}`
`209`	`206`
`210`	`207`	`static onclick(e) {`