fix instance unregistration (fix #1372)

yyx990803 · yyx990803 · commit 23bedc90e428 · 2017-05-01T15:51:53.000+08:00
diff --git a/src/components/view.js b/src/components/view.js
@@ -52,7 +52,11 @@ export default {
     // this will be called in the instance's injected lifecycle hooks
     data.registerRouteInstance = (vm, val) => {
       // val could be undefined for unregistration
-      if (matched.instances[name] !== vm) {
+      const current = matched.instances[name]
+      if (
+        (val && current !== vm) ||
+        (!val && current === vm)
+      ) {
         matched.instances[name] = val
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,11 @@ export default {`
`52`	`52`	`// this will be called in the instance's injected lifecycle hooks`
`53`	`53`	`data.registerRouteInstance = (vm, val) => {`
`54`	`54`	`// val could be undefined for unregistration`
`55`		`- if (matched.instances[name] !== vm) {`
	`55`	`+ const current = matched.instances[name]`
	`56`	`+ if (`
	`57`	`+ (val && current !== vm) \|\|`
	`58`	`+ (!val && current === vm)`
	`59`	`+ ) {`
`56`	`60`	`matched.instances[name] = val`
`57`	`61`	`}`
`58`	`62`	`}`