Property check for getDefaultActionAlias on node #20249
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc\ @zhangsu |
src/service/action-impl.js
Outdated
| @@ -914,7 +915,7 @@ function tokenizeMethodArguments(toks, assertToken, assertAction) { | |||
| let args = null; | |||
| // Object literal. Format: {...} | |||
| if (peek.type == TokenType.OBJECT) { | |||
| // Don't parse object literals. Tokenize as a single expression | |||
| // Don't parse object literalands. Tokenize as a single expression | |||
There was a problem hiding this comment.
yes, reverted. thanks
src/service/action-impl.js
Outdated
| @@ -748,9 +748,10 @@ function isActionWhitelisted_(invocation, whitelist) { | |||
| const {method, node, tagOrTarget} = invocation; | |||
| const tagOrTargetCalled = tagOrTarget.toLowerCase(); | |||
| let methodCalled = method.toLowerCase(); | |||
| const defaultActionAlias = node.getDefaultActionAlias(); | |||
| const defaultActionAlias = (typeof node.getDefaultActionAlias == 'function') | |||
There was a problem hiding this comment.
I think this can be cleaner:
const {method, node, tagOrTarget} = invocation;
// Use alias if default action was invoked.
if (method === DEFAULT_ACTION && typeof node.getDefaultActionAlias === 'function') {
method = node.getDefaultActionAlias();
}
const lcMethod = method.toLowerCase();
const lcTagOrTarget = tagOrTarget.toLowerCase();
return whitelist.some(w => {
return (lcMethod === w.method.toLowerCase()
&& lcTagOrTarget === w.tagOrTarget.toLowerCase());
});
dreamofabear
approved these changes
Jan 10, 2019
| if (calledByDefaultActionAndHasDefaultAlias) { | ||
| methodCalled = defaultActionAlias.toLowerCase(); | ||
| let {method, node, tagOrTarget} = invocation; | ||
| if (method === DEFAULT_ACTION |
There was a problem hiding this comment.
Minor: Add a comment above this conditional.
// Use alias if default action is invoked.
src/service/action-impl.js
Outdated
| return whitelist.some(w => { | ||
| return (w.tagOrTarget === '*' | ||
| || w.tagOrTarget.toLowerCase() === lcTagOrTarget) && | ||
| (w.method.toLowerCase() === lcMethod); |
There was a problem hiding this comment.
Forgot about * target. In this case I'd deconstruct it for readability:
return whitelist.some(w => {
if (w.tagOrTarget.toLowerCase() === lcTagOrTarget || (w.tagOrTarget === '*')) {
if (w.method.toLowerCase() === lcMethod) {
return true;
}
}
return false;
});
noranazmy
pushed a commit
to noranazmy/amphtml
that referenced
this pull request
Mar 22, 2019
* check for method on node * !! to coerce string to bool to guard against empty string default alias * choumx comment * choumx comment * comment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check that function 'getDefaultActionAlias' exists on node as the node can be document whereas the method will not exist.
b/122615607