Skip to content

Commit

Permalink
Merge pull request #900 from sveltejs/event-handler-options-callee
Browse files Browse the repository at this point in the history
allow options.* as event handler callee
  • Loading branch information
Rich-Harris authored Oct 20, 2017
2 parents 89ad91d + cc8614c commit 921ad06
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/validate/html/validateEventHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function validateEventHandlerCallee(

const { name } = flattenReference(callee);

if (validCalleeObjects.has(name)) return;
if (validCalleeObjects.has(name) || name === 'options') return;

if (name === 'refs') {
refCallees.push(callee);
Expand All @@ -34,7 +34,7 @@ export default function validateEventHandlerCallee(
)
return;

const validCallees = ['this.*', 'event.*', 'console.*'].concat(
const validCallees = ['this.*', 'event.*', 'options.*', 'console.*'].concat(
Array.from(validBuiltins),
Array.from(validator.methods.keys())
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[{
"message": "'foo' is an invalid callee (should be one of this.*, event.*, console.*, set, fire, destroy or bar). 'foo' exists on 'helpers', did you put it in the wrong place?",
"message": "'foo' is an invalid callee (should be one of this.*, event.*, options.*, console.*, set, fire, destroy or bar). 'foo' exists on 'helpers', did you put it in the wrong place?",
"pos": 18,
"loc": {
"line": 1,
Expand Down
2 changes: 1 addition & 1 deletion test/validator/samples/method-nonexistent/warnings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[{
"message": "'foo' is an invalid callee (should be one of this.*, event.*, console.*, set, fire, destroy or bar)",
"message": "'foo' is an invalid callee (should be one of this.*, event.*, options.*, console.*, set, fire, destroy or bar)",
"pos": 18,
"loc": {
"line": 1,
Expand Down
4 changes: 2 additions & 2 deletions test/validator/samples/window-event-invalid/warnings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[{
"message": "'resize' is an invalid callee (should be one of this.*, event.*, console.*, set, fire or destroy)",
"message": "'resize' is an invalid callee (should be one of this.*, event.*, options.*, console.*, set, fire or destroy)",
"loc": {
"line": 1,
"column": 20
},
"pos": 20
}]
}]

0 comments on commit 921ad06

Please sign in to comment.