|
@@ -10,8 +10,8 @@ export function initLifecycle (vm: Component) {
|
|
|
|
|
|
|
|
// locate first non-abstract parent
|
|
// locate first non-abstract parent
|
|
|
let parent = options.parent
|
|
let parent = options.parent
|
|
|
- if (parent && !options._abstract) {
|
|
|
|
|
- while (parent.$options._abstract && parent.$parent) {
|
|
|
|
|
|
|
+ if (parent && !options.abstract) {
|
|
|
|
|
+ while (parent.$options.abstract && parent.$parent) {
|
|
|
parent = parent.$parent
|
|
parent = parent.$parent
|
|
|
}
|
|
}
|
|
|
parent.$children.push(vm)
|
|
parent.$children.push(vm)
|
|
@@ -154,7 +154,7 @@ export function lifecycleMixin (Vue: Class<Component>) {
|
|
|
vm._isBeingDestroyed = true
|
|
vm._isBeingDestroyed = true
|
|
|
// remove self from parent
|
|
// remove self from parent
|
|
|
const parent = vm.$parent
|
|
const parent = vm.$parent
|
|
|
- if (parent && !parent._isBeingDestroyed && !vm.$options._abstract) {
|
|
|
|
|
|
|
+ if (parent && !parent._isBeingDestroyed && !vm.$options.abstract) {
|
|
|
remove(parent.$children, vm)
|
|
remove(parent.$children, vm)
|
|
|
}
|
|
}
|
|
|
// teardown watchers
|
|
// teardown watchers
|