Skip to content

fix #6918: v-if / v-else not working with :type + v-model #6955

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

Merged
merged 3 commits into from
Nov 2, 2017
Merged

fix #6918: v-if / v-else not working with :type + v-model #6955

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9737d1b
Add test to verify bug reported in issue #6918
misoguy Oct 26, 2017
052c53a
Add Implementation to fix issue #6918
misoguy Oct 30, 2017
c2b52ac
fix(model): fix dynamic v-model with v-else-if statement
gebilaoxiong Oct 30, 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
Prev Previous commit
fix(model): fix dynamic v-model with v-else-if statement
  • Loading branch information
@gebilaoxiong
gebilaoxiong committed Oct 30, 2017
commit c2b52ac91890c700d0efaf6f7baf257994bfed6f
3 changes: 3 additions & 0 deletions src/platforms/web/compiler/modules/model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ function preTransformNode (el: ASTElement, options: CompilerOptions) {
const ifCondition = getAndRemoveAttr(el, 'v-if', true)
const ifConditionExtra = ifCondition ? `&&(${ifCondition})` : ``
const hasElse = getAndRemoveAttr(el, 'v-else', true) != null
const elseIfCondition = getAndRemoveAttr(el, 'v-else-if', true)
// 1. checkbox
const branch0 = cloneASTElement(el)
// process for on the main node
Expand Down Expand Up @@ -63,6 +64,8 @@ function preTransformNode (el: ASTElement, options: CompilerOptions) {

if (hasElse) {
branch0.else = true
} else if (elseIfCondition) {
branch0.elseif = elseIfCondition
}

return branch0
Expand Down
25 changes: 25 additions & 0 deletions test/unit/features/directives/model-dynamic.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,31 @@ describe('Directive v-model dynamic input type', () => {
assertInputWorks(vm).then(done)
})

it('with v-else-if', done => {
const vm = new Vue({
data: {
foo: true,
bar: false,
type: null,
test: 'b'
},
template: `<div v-if="foo">text</div><input v-else-if="bar" :type="type" v-model="test">`
}).$mount()
document.body.appendChild(vm.$el)

const chain = waitForUpdate(() => {
expect(vm.$el.textContent).toBe('text')
}).then(() => {
vm.foo = false
}).then(() => {
expect(vm._vnode.isComment).toBe(true)
}).then(() => {
vm.bar = true
})

assertInputWorks(vm, chain).then(done)
})

it('with v-for', done => {
const vm = new Vue({
data: {
Expand Down