Skip to content
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

Fix parsing of custom properties with 'var' in value #2662

Merged
merged 1 commit into from
Nov 4, 2015

Conversation

TimvdLippe
Copy link
Contributor

(Note: the newline 'changes' are solved after #2484)

image

The screenshot shows the new behaviour. It only consumes lines with
<css-property-name>:<anything not a ;>var(<anything not a ;>)<optional ; and \n>

  • It leaves the first line which was the original issue.
  • It consumes the second line, which is a var assignment
  • It consumes the third line which is preceded with a var assignment
  • It leaves the fourth line, a property between assignments
  • It consumes the whole fifth line, which does not have a new line between the two variable assignments
  • It consumes the second part of the sixth line, which does not have a new line between the custom property and the variable assignment
  • It consumes the first part of the seventh line, which does not have a new line between the variable assignment and the custom property

Fixes #2660

@TimvdLippe TimvdLippe force-pushed the custom-properties-var branch from dde18d2 to 61abfbd Compare October 31, 2015 23:10
@nazar-pc
Copy link
Contributor

nazar-pc commented Nov 1, 2015

LGTM, 👍

@samccone
Copy link
Contributor

samccone commented Nov 2, 2015

🙇 this is amazing work @JeremybellEU thanks a million!

R: @tjsavage

@tjsavage
Copy link
Contributor

tjsavage commented Nov 2, 2015

This LGTM. Adding @sorvell to take a look.

@dfreedm dfreedm assigned dfreedm and unassigned sorvell Nov 4, 2015
@dfreedm
Copy link
Member

dfreedm commented Nov 4, 2015

LGTM

dfreedm added a commit that referenced this pull request Nov 4, 2015
Fix parsing of custom properties with 'var' in value
@dfreedm dfreedm merged commit a975c46 into Polymer:master Nov 4, 2015
@TimvdLippe TimvdLippe deleted the custom-properties-var branch November 4, 2015 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants