|
|
@@ -285,8 +285,9 @@ export function createPatchFunction (backend) {
|
|
|
}
|
|
|
// for slot content they should also get the scopeId from the host instance.
|
|
|
if (isDef(i = activeInstance) &&
|
|
|
- i !== vnode.context &&
|
|
|
- isDef(i = i.$options._scopeId)) {
|
|
|
+ i !== vnode.context &&
|
|
|
+ isDef(i = i.$options._scopeId)
|
|
|
+ ) {
|
|
|
nodeOps.setAttribute(vnode.elm, i, '')
|
|
|
}
|
|
|
}
|
|
|
@@ -438,9 +439,10 @@ export function createPatchFunction (backend) {
|
|
|
// if the new node is not cloned it means the render functions have been
|
|
|
// reset by the hot-reload-api and we need to do a proper re-render.
|
|
|
if (isTrue(vnode.isStatic) &&
|
|
|
- isTrue(oldVnode.isStatic) &&
|
|
|
- vnode.key === oldVnode.key &&
|
|
|
- (isTrue(vnode.isCloned) || isTrue(vnode.isOnce))) {
|
|
|
+ isTrue(oldVnode.isStatic) &&
|
|
|
+ vnode.key === oldVnode.key &&
|
|
|
+ (isTrue(vnode.isCloned) || isTrue(vnode.isOnce))
|
|
|
+ ) {
|
|
|
vnode.elm = oldVnode.elm
|
|
|
vnode.componentInstance = oldVnode.componentInstance
|
|
|
return
|
|
|
@@ -529,8 +531,9 @@ export function createPatchFunction (backend) {
|
|
|
// longer than the virtual children list.
|
|
|
if (!childrenMatch || childNode) {
|
|
|
if (process.env.NODE_ENV !== 'production' &&
|
|
|
- typeof console !== 'undefined' &&
|
|
|
- !bailed) {
|
|
|
+ typeof console !== 'undefined' &&
|
|
|
+ !bailed
|
|
|
+ ) {
|
|
|
bailed = true
|
|
|
console.warn('Parent: ', elm)
|
|
|
console.warn('Mismatching childNodes vs. VNodes: ', elm.childNodes, children)
|