Separated trimLine content and url regexp's and made them work better #347
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
|
Tests pass, so should be GTG. I don't know enough regex to comment on that part though... @rossPatton? |
watzon
commented
Oct 1, 2016
| @@ -1,6 +1,7 @@ | |||
| 'use strict' | |||
|
|
|||
| var urlOrContentRe = /(["'].+["'])|( +|:)url\(.+\)/ | |||
| var contentRe = /(content:\s*["'])(?:.+)(["'])/ | |||
There was a problem hiding this comment.
This regexp creates 2 match groups. The first is the content: " part and the second basically just amounts to the closing quotation mark and possibly semicolon.
watzon
commented
Oct 1, 2016
| @@ -1,6 +1,7 @@ | |||
| 'use strict' | |||
|
|
|||
| var urlOrContentRe = /(["'].+["'])|( +|:)url\(.+\)/ | |||
| var contentRe = /(content:\s*["'])(?:.+)(["'])/ | |||
| var urlRe = /([\S ]+\:\s*url\s*\(["'])(?:.+)(["']\))/ | |||
There was a problem hiding this comment.
This regexp matches anything before and after a url expression such as background: url("../images/someimage.png") center center; With that expression it would match background: url(" and ") center center;
|
@iDev0urer Could you add a test that fails without this change? I'll do some refactoring in the near future, would be great if this had a regression test in place 😄 |
|
@watzon Ping 😄 |
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.
Separated the original
urlOrCOntentReinto 2 separate regexp's and made them more specific so they don't match incorrect patterns.