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

Enable url function overloading #1010

Merged
merged 1 commit into from
Apr 4, 2015
Merged

Conversation

mgreter
Copy link
Contributor

@mgreter mgreter commented Mar 31, 2015

@xzyfer maybe give it a review and we probably also want to include in 3.2.0? I don't really see any reason that tests shouldn't have catched any obvious regressions this could introduce!
And it does fix #674 (the refactor made the code actually a bit slimer)!

@mgreter mgreter self-assigned this Mar 31, 2015
@mgreter mgreter added this to the 3.2.1 milestone Mar 31, 2015
@mgreter mgreter force-pushed the bugfix/issue_674 branch 2 times, most recently from b802ecf to cc1fde7 Compare March 31, 2015 17:56
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.11%) to 79.98% when pulling cc1fde7 on mgreter:bugfix/issue_674 into d215db5 on sass:master.

@mgreter
Copy link
Contributor Author

mgreter commented Mar 31, 2015

CI seems finally happy! IMO this is ready to be merged!

@xzyfer
Copy link
Contributor

xzyfer commented Apr 1, 2015

Could you add a spec for this to prevent future regressions?

@@ -1118,10 +1130,10 @@ namespace Sass {
{
Expression* conj1 = parse_conjunction();
// if it's a singleton, return it directly; don't wrap it
if (!peek< sequence< kwd_or, negate< identifier > > >()) return conj1;
if (!peek_css< kwd_or >()) return conj1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does peek_css force word boundaries? Otherwise this is a regression.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, but kwd_or is forced to have word boundaries 😉

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha that's new. Cool.

@mgreter
Copy link
Contributor Author

mgreter commented Apr 2, 2015

@xzyfer should we include this in next 3.2.0-beta.5 release?

@xzyfer
Copy link
Contributor

xzyfer commented Apr 3, 2015

I think this can wait. It's an edge case case. Now is probably a good time
for a feature freeze, thoughts?
On 3 Apr 2015 09:25, "Marcel Greter" notifications@github.com wrote:

@xzyfer https://github.com/xzyfer should we include this in next
3.2.0-beta.5 release?


Reply to this email directly or view it on GitHub
#1010 (comment).

@mgreter
Copy link
Contributor Author

mgreter commented Apr 3, 2015

I wanted to have the real feature freeze when the next node-sass beta is out. As I have written in #1020, we should create a new beta once node-sass is ready to release its next beta. IMO we can add a few more bugfixes until then. But from then on I would say we close the window and really only commit bugfixes. BTW. the original issue was marked as a bug, so technically this is a bugfix 😉

@xzyfer
Copy link
Contributor

xzyfer commented Apr 3, 2015

Lol technicalities. Ship it.
On 3 Apr 2015 21:17, "Marcel Greter" notifications@github.com wrote:

I wanted to have the real feature freeze when the next node-sass beta is
out. As I have written in #1020
#1020, we should create a new
beta once node-sass is ready to release its next beta. IMO we can add a few
more bugfixes until then. But from then on I would say we close the window
and really only commit bugfixes. BTW. the original issue was marked as a
bug, so technically this is a bugfix [image: 😉]


Reply to this email directly or view it on GitHub
#1010 (comment).

@mgreter mgreter modified the milestones: 3.2, 3.2.1 Apr 3, 2015
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.13%) to 80.59% when pulling fd1814c on mgreter:bugfix/issue_674 into 70992f4 on sass:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.13%) to 80.59% when pulling fd1814c on mgreter:bugfix/issue_674 into 70992f4 on sass:master.

mgreter added a commit that referenced this pull request Apr 4, 2015
Enable url function overloading
@mgreter mgreter merged commit 5a037bb into sass:master Apr 4, 2015
@mgreter mgreter deleted the bugfix/issue_674 branch April 6, 2015 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Users cannot safely redefine url()
3 participants