mirrors/svelte
mirrors/svelte
0
0
Fork 0
mirror of https://github.com/sveltejs/svelte.git synced 2024-12-01 17:30:59 +01:00
Code Issues Releases Wiki Activity

disallow passive|preventDefault combo

Browse Source
This commit is contained in:
Rich Harris 2018-10-28 13:58:43 -04:00
parent 82b1b75afe
commit b3b95d4ee6
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/compile/nodes/Element.ts
View File

@ -585,6 +585,13 @@ export default class Element extends Node {
]);
this.handlers.forEach(handler => {
if (handler.modifiers.has('passive') && handler.modifiers.has('preventDefault')) {
component.error(handler, {
code: 'invalid-event-modifier',
message: `The 'passive' and 'preventDefault' modifiers cannot be used together`
});
}
handler.modifiers.forEach(modifier => {
if (!validModifiers.has(modifier)) {
component.error(handler, {
@ -619,7 +626,7 @@ export default class Element extends Node {
}
});
if (passiveEvents.has(handler.name) && !handler.usesEventObject) {
if (passiveEvents.has(handler.name) && !handler.usesEventObject && !handler.modifiers.has('preventDefault')) {
// touch/wheel events should be passive by default
handler.modifiers.add('passive');
}

15
test/validator/samples/event-modifiers-invalid-passive/errors.json Normal file
View File

@ -0,0 +1,15 @@
[{
"message": "The 'passive' and 'preventDefault' modifiers cannot be used together",
"code": "invalid-event-modifier",
"start": {
"line": 1,
"column": 5,
"character": 5
},
"end": {
"line": 1,
"column": 52,
"character": 52
},
"pos": 5
}]

3
test/validator/samples/event-modifiers-invalid-passive/input.html Normal file
View File

@ -0,0 +1,3 @@
<div on:wheel|passive|preventDefault="handleWheel()">
oops
</div>