always call original destroy in override (fix #339)

yyx990803 · yyx990803 · commit 1a5b1633d355 · 2016-01-22T12:35:48.000-05:00
diff --git a/src/override.js b/src/override.js
@@ -31,12 +31,10 @@ export default function (Vue) {
 
   const destroy = Vue.prototype._destroy
   Vue.prototype._destroy = function () {
-    if (!this._isBeingDestroyed) {
-      if (this.$router) {
-        this.$router._children.$remove(this)
-      }
-      destroy.apply(this, arguments)
+    if (!this._isBeingDestroyed && this.$router) {
+      this.$router._children.$remove(this)
     }
+    destroy.apply(this, arguments)
   }
 
   // 1.0 only: enable route mixins

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,10 @@ export default function (Vue) {`
`31`	`31`
`32`	`32`	`const destroy = Vue.prototype._destroy`
`33`	`33`	`Vue.prototype._destroy = function () {`
`34`		`- if (!this._isBeingDestroyed) {`
`35`		`- if (this.$router) {`
`36`		`- this.$router._children.$remove(this)`
`37`		`- }`
`38`		`- destroy.apply(this, arguments)`
	`34`	`+ if (!this._isBeingDestroyed && this.$router) {`
	`35`	`+ this.$router._children.$remove(this)`
`39`	`36`	`}`
	`37`	`+ destroy.apply(this, arguments)`
`40`	`38`	`}`
`41`	`39`
`42`	`40`	`// 1.0 only: enable route mixins`