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

Jump to bottom

Static type="checkbox" with v-bind (fix #7811) #7819

Merged
merged 3 commits into from
Mar 13, 2018
Merged

Static type="checkbox" with v-bind (fix #7811) #7819

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc72e6c
Merge pull request #1 from vuejs/dev
privatenumber Mar 13, 2018
f9991b5
fix(model): Static type="checkbox" was being ignored when used with v…
Mar 13, 2018
01223f1
Update model-checkbox.spec.js
yyx990803 Mar 13, 2018
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
2 changes: 1 addition & 1 deletion src/platforms/web/compiler/modules/model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function preTransformNode (el: ASTElement, options: CompilerOptions) {
if (map[':type'] || map['v-bind:type']) {
typeBinding = getBindingAttr(el, 'type')
}
if (!typeBinding && map['v-bind']) {
if (!map.type && !typeBinding && map['v-bind']) {
Copy link
Member

@jkzing jkzing Mar 13, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would make following case lose type binding:

<input type="checkbox" v-model="test" v-bind="{type: typeBindingValue}">

So maybe

typeBinding = `(${map['v-bind']}).type || '${map.type}'`

EDIT: the one above is not comprehensive, while map.type still could be undefined.

typeBinding = `(${map['v-bind']}).type || ${JSON.stringify(map.type)}`

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hirokiosame If you could add the test as well, that would be great 👌

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should allow v-bind to override a static type, it's gonna be confusing if done accidentally and I don't think there's a valid use case.

typeBinding = `(${map['v-bind']}).type`
}

Expand Down
10 changes: 10 additions & 0 deletions test/unit/features/directives/model-checkbox.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,4 +337,14 @@ describe('Directive v-model checkbox', () => {
expect(vm.$el.children[1].textContent).toBe('false')
}).then(done)
})

it('should have type="checkbox"', () => {
const vm = new Vue({
data: {
test: true
},
template: '<input type="checkbox" v-model="test" v-bind="$attrs">'
}).$mount()
expect(vm.$el.type).toBe('checkbox')
})
})