Refactor removing style tags #72
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
Closed
| */ | ||
| private function stripOriginalStyleTags($html) | ||
| private function stripOriginalStyleTags($xPath) |
There was a problem hiding this comment.
Shouldn't we typehint it in the definition too?
This uses xPath to find the style tags and either remove the style tag completely, or replace them with just the media queries, based on the excludeMediaQueries flag. This follows the logic that if the mediaqueries are excluded from inlining, they should not be stripped from the document, because they aren't processed. If for some reason they are processed (don't know the use case) they can just be removed.
| */ | ||
| private function stripOriginalStyleTags($html) | ||
| private function stripOriginalStyleTags(\DOMXPath $xPath) |
There was a problem hiding this comment.
Shouldn't we add use DOMXPath; at the start of the file, and then ref this without the slash - just a minor cs point. :)
There was a problem hiding this comment.
Could be, but that is also not done for the other classes, so this is more in line with the rest. But Tijs is free to change this of course.
There was a problem hiding this comment.
Sure thing. After all the open pulls are closed/merged, I might make a pull to standardise this.
tijsverkoyen
added a commit
that referenced
this pull request
Jul 31, 2014
Refactor removing style tags
|
Thanks! |
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.
This uses xPath to find the style tags and either remove the style tag completely, or replace them with just the media queries, based on the excludeMediaQueries flag.
This follows the logic that if the mediaqueries are excluded from inlining, they should not be stripped from the document, because they aren't processed.
If for some reason they are processed (don't know the use case) they can just be removed.
This uses xPath instead of the earlier regex, because this seems easier/more reliable. I did think about changing the finding of styles to also use xPath, but according to the docs/comments the order in which the results are returned isn't 100% reliable.
Replaces #54