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.

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

support mouse modifier - #3050 #4866

Merged
merged 2 commits into from Feb 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/compiler/codegen/events.js
Expand Up @@ -26,7 +26,10 @@ const modifierCode: { [key: string]: string } = {
ctrl: 'if(!$event.ctrlKey)return null;',
shift: 'if(!$event.shiftKey)return null;',
alt: 'if(!$event.altKey)return null;',
meta: 'if(!$event.metaKey)return null;'
meta: 'if(!$event.metaKey)return null;',
left: 'if($event.button !== 0)return null;',
middle: 'if($event.button !== 1)return null;',
right: 'if($event.button !== 2)return null;'
}

export function genHandlers (events: ASTElementHandlers, native?: boolean): string {
Expand Down
43 changes: 43 additions & 0 deletions test/unit/features/directives/on.spec.js
Expand Up @@ -212,6 +212,49 @@ describe('Directive v-on', () => {
expect(spy).toHaveBeenCalled()
})

it('should support mouse modifier', () => {
const left = 0
const middle = 1
const right = 2
const spyLeft = jasmine.createSpy()
const spyMiddle = jasmine.createSpy()
const spyRight = jasmine.createSpy()

vm = new Vue({
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>
`,
methods: {
foo: spyLeft,
foo1: spyRight,
foo2: spyMiddle
}
})

triggerEvent(vm.$refs.left, 'mousedown', e => { e.button = right })
triggerEvent(vm.$refs.left, 'mousedown', e => { e.button = middle })
expect(spyLeft).not.toHaveBeenCalled()
triggerEvent(vm.$refs.left, 'mousedown', e => { e.button = left })
expect(spyLeft).toHaveBeenCalled()

triggerEvent(vm.$refs.right, 'mousedown', e => { e.button = left })
triggerEvent(vm.$refs.right, 'mousedown', e => { e.button = middle })
expect(spyRight).not.toHaveBeenCalled()
triggerEvent(vm.$refs.right, 'mousedown', e => { e.button = right })
expect(spyRight).toHaveBeenCalled()

triggerEvent(vm.$refs.middle, 'mousedown', e => { e.button = left })
triggerEvent(vm.$refs.middle, 'mousedown', e => { e.button = right })
expect(spyMiddle).not.toHaveBeenCalled()
triggerEvent(vm.$refs.middle, 'mousedown', e => { e.button = middle })
expect(spyMiddle).toHaveBeenCalled()
})

it('should support custom keyCode', () => {
Vue.config.keyCodes.test = 1
vm = new Vue({
Expand Down