Fix for mixins declaration with space before colon #2322
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
nazar-pc
added a commit
to nazar-pc/CleverStyle-Framework
that referenced
this pull request
Aug 20, 2015
Patches included: * Polymer/polymer#2205 * Polymer/polymer#2247 * Polymer/polymer#2258 * Polymer/polymer#2266 * Polymer/polymer#2286 (accepted upstream) * Polymer/polymer#2295 * Polymer/polymer#2322
nazar-pc
added a commit
to nazar-pc/CleverStyle-Framework
that referenced
this pull request
Aug 22, 2015
nazar-pc
added a commit
to nazar-pc/CleverStyle-Framework
that referenced
this pull request
Aug 26, 2015
nazar-pc
force-pushed
the
fix-for-mixins-parsing
branch
from
60cb3bc to
d3bda2b
Compare
nazar-pc
added a commit
to nazar-pc/CleverStyle-Framework
that referenced
this pull request
Aug 29, 2015
nazar-pc
added a commit
to nazar-pc/CleverStyle-Framework
that referenced
this pull request
Sep 5, 2015
|
Thanks for the pull request - apologies for the delay here. This looks like a solid fix - would you mind squashing the commits? |
nazar-pc
force-pushed
the
fix-for-mixins-parsing
branch
from
0d31daf to
e91048c
Compare
|
Rebased against master and squashed into single commit. |
|
👍 lgtm |
Allow any space character or even `{` and `}` (before and after capturing pattern correspondingly) as pattern boundaries instead of new lines only.
In minified sources there might be no space, semicolon or line start, so we need to account that as well.
nazar-pc
force-pushed
the
fix-for-mixins-parsing
branch
from
e91048c to
883aa5c
Compare
nazar-pc
added a commit
to nazar-pc/CleverStyle-Framework
that referenced
this pull request
Oct 8, 2015
Patches applied on top of stable version: * Polymer/polymer#2205 * Polymer/polymer#2247 * Polymer/polymer#2295 * Polymer/polymer#2322 * Polymer/polymer#2349 * Polymer/polymer#2419
|
I think this should be good to go, @tjsavage anything else here? |
|
LGTM - @azakus any idea why the tests would be failing? |
|
It doesn't look like these tests have been run since our fix in webcomponentsjs for the failing IE tests. |
|
How to trigger it? |
|
The IE failures are fixed with 1.2.0, this PR should pass after merging. |
|
@nazar-pc already did. This PR was using the old homegrown CI, new PRs will use Travis CI. |
|
Confirm IE 10 and IE 11 passing after merging with Polymer on master. |
|
LGTM |
dfreedm
added a commit
that referenced
this pull request
Oct 26, 2015
Fix for mixins declaration with space before colon
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.
With this fix both work fine.