-
Notifications
You must be signed in to change notification settings - Fork 47k
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
Replace the implementation of escapeTextContentForBrowser with escape-html #6862
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
9baaf0a
Replacing the implementation of escapeTextContentForBrowser with esca…
aickin 28b49ea
Addressing @spicyj's code review comment here: https://github.com/fac…
aickin 97e359a
Addressing code review comment https://github.com/facebook/react/pull…
aickin 7cc0c80
Merge branch 'master' into use-escape-html
aickin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,19 +11,7 @@ | |
|
||
'use strict'; | ||
|
||
var ESCAPE_LOOKUP = { | ||
'&': '&', | ||
'>': '>', | ||
'<': '<', | ||
'"': '"', | ||
'\'': ''', | ||
}; | ||
|
||
var ESCAPE_REGEX = /[&><"']/g; | ||
|
||
function escaper(match) { | ||
return ESCAPE_LOOKUP[match]; | ||
} | ||
var escapeHtml = require('escape-html'); | ||
|
||
/** | ||
* Escapes text to prevent scripting attacks. | ||
|
@@ -32,7 +20,16 @@ function escaper(match) { | |
* @return {string} An escaped string. | ||
*/ | ||
function escapeTextContentForBrowser(text) { | ||
return ('' + text).replace(ESCAPE_REGEX, escaper); | ||
switch (typeof text) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually, can we inline |
||
case 'boolean': | ||
case 'number': | ||
// this shortcircuit helps perf for types that we know will never have | ||
// special characters, especially given that this function is used often | ||
// for numeric dom ids. | ||
return '' + text; | ||
default: | ||
return escapeHtml(text); | ||
} | ||
} | ||
|
||
module.exports = escapeTextContentForBrowser; |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
escape-html
uses'
instead of'
, which should be a completely equivalent HTML entity for single quote (and it's one byte less, too).