Skip to content

fix mouse modifier override the keycode ( Fixed #5046 ) #5060

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

Closed
wants to merge 2 commits into from
Closed

fix mouse modifier override the keycode ( Fixed #5046 ) #5060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e7b3db
fix mouse modifier override the keycode
Mar 2, 2017
4ebd8d4
reset override build-in keyCode config
Mar 2, 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
6 changes: 3 additions & 3 deletions src/compiler/codegen/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ const modifierCode: { [key: string]: string } = {
shift: genGuard(`!$event.shiftKey`),
alt: genGuard(`!$event.altKey`),
meta: genGuard(`!$event.metaKey`),
left: genGuard(`$event.button !== 0`),
middle: genGuard(`$event.button !== 1`),
right: genGuard(`$event.button !== 2`)
btnleft: genGuard(`$event.button !== 0`),
btnmiddle: genGuard(`$event.button !== 1`),
btnright: genGuard(`$event.button !== 2`)
}

export function genHandlers (events: ASTElementHandlers, native?: boolean): string {
Expand Down
41 changes: 38 additions & 3 deletions test/unit/features/directives/on.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ describe('Directive v-on', () => {
el,
template: `
<div>
<div ref="left" @mousedown.left="foo">left</div>
<div ref="right" @mousedown.right="foo1">right</div>
<div ref="middle" @mousedown.middle="foo2">right</div>
<div ref="left" @mousedown.btnleft="foo">left</div>
<div ref="right" @mousedown.btnright="foo1">right</div>
<div ref="middle" @mousedown.btnmiddle="foo2">right</div>
</div>
`,
methods: {
Expand Down Expand Up @@ -288,6 +288,8 @@ describe('Directive v-on', () => {
e.keyCode = 40
})
expect(spy).toHaveBeenCalledTimes(3)
// reset config
Vue.config.keyCodes = Object.create(null)
})

it('should bind to a child component', () => {
Expand Down Expand Up @@ -483,4 +485,37 @@ describe('Directive v-on', () => {
triggerEvent(vm.$el, 'click')
}).not.toThrow()
})

// Github Issue #5046
it('should support keyboard modifier', () => {
const spyLeft = jasmine.createSpy()
const spyRight = jasmine.createSpy()
const spyUp = jasmine.createSpy()
const spyDown = jasmine.createSpy()
vm = new Vue({
el,
template: `
<div>
<input ref="left" @keydown.left="foo"></input>
<input ref="right" @keydown.right="foo1"></input>
<input ref="up" @keydown.up="foo2"></input>
<input ref="down" @keydown.down="foo3"></input>
</div>
`,
methods: {
foo: spyLeft,
foo1: spyRight,
foo2: spyUp,
foo3: spyDown
}
})
triggerEvent(vm.$refs.left, 'keydown', e => { e.keyCode = 37 })
triggerEvent(vm.$refs.right, 'keydown', e => { e.keyCode = 39 })
triggerEvent(vm.$refs.up, 'keydown', e => { e.keyCode = 38 })
triggerEvent(vm.$refs.down, 'keydown', e => { e.keyCode = 40 })
expect(spyLeft).toHaveBeenCalled()
expect(spyRight).toHaveBeenCalled()
expect(spyUp).toHaveBeenCalled()
expect(spyDown).toHaveBeenCalled()
})
})