Link style #1681
Merged
Link style #1681
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
also makes our handling of style and href more flexible and robust
etpinard
reviewed
May 12, 2017
| // so we need to use dy along with the uber hacky shift-back-to | ||
| // baseline below | ||
| sup: 'font-size:70%" dy="-0.6em', | ||
| sub: 'font-size:70%" dy="0.3em', | ||
| b: 'font-weight:bold', | ||
| i: 'font-style:italic', | ||
| a: '', | ||
| a: 'cursor:pointer', |
etpinard
reviewed
May 12, 2017
| @@ -254,6 +260,16 @@ var UNICODE_TO_ENTITY = Object.keys(stringMappings.unicodeToEntity).map(function | |||
|
|
|||
| var NEWLINES = /(\r\n?|\n)/g; | |||
|
|
|||
| var SPLIT_TAGS = /(<[^<>]*>)/; | |||
etpinard
reviewed
May 12, 2017
| @@ -120,7 +122,8 @@ describe('svg+text utils', function() { | |||
| assertAnchorLink(node, 'mailto:support@plot.ly'); | |||
| }); | |||
|
|
|||
| it('wraps XSS attacks in href', function() { | |||
| it('drops XSS attacks in href', function() { | |||
| // "XSS" gets interpreted as a relative link (http) | |||
and test these as well as tag auto-close/open
alexcjohnson
commented
May 13, 2017
| @@ -283,7 +283,7 @@ describe('Test sort transform interactions:', function() { | |||
|
|
|||
| function wait() { | |||
| return new Promise(function(resolve) { | |||
| setTimeout(resolve, 60); | |||
| setTimeout(resolve, 100); | |||
There was a problem hiding this comment.
@etpinard it took 3 tries to get this test to pass on CI with the original timeout, first try with it a little longer.
etpinard
reviewed
May 15, 2017
| // Style and href: pull them out of either single or double quotes. | ||
| // Because we hack in other attributes with style (sub & sup), drop any trailing | ||
| // semicolon in user-supplied styles so we can consistently append the tag-dependent style | ||
| var STYLEMATCH = /(^|[\s"'])style\s*=\s*("([^"]*);?"|'([^']*);?')/i; |
There was a problem hiding this comment.
learn something new every day.
There was a problem hiding this comment.
(PSA: have to be careful with g! it adds a dependency on internal state of a regexp, which is super confusing if you're not expecting it)
|
Looks good 💃 |
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.
Fixes #1674
cursor: pointerlike regular html links<a>elements in text, and make our parsing of these fields more robust@etpinard OK?