Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #6687 out-in transition getting stuck with v-if #7023

Merged
merged 4 commits into from
Nov 16, 2017
Merged

fix #6687 out-in transition getting stuck with v-if #7023

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b4cadb
fix out-in transition getting stuck with v-if
neelance Nov 8, 2017
e24747c
inline constant to make flow happy
neelance Nov 9, 2017
6b4d374
check that oldChild.elm is set
neelance Nov 10, 2017
fcceb57
Update transition.js
yyx990803 Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/platforms/web/runtime/components/transition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ export default {
oldChild &&
oldChild.data &&
!isSameChild(child, oldChild) &&
!isAsyncPlaceholder(oldChild)
!isAsyncPlaceholder(oldChild) &&
// #6687 component root is a comment node
!(oldChild.componentInstance && oldChild.componentInstance._vnode.isComment)
) {
// replace old child transition data with fresh one
// important for dynamic transitions!
Expand Down