Fix ordering of @import and @charset rules #1954 #2013 #2117
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
added 2 commits
July 22, 2014 14:46
The genCss method of ruleset.js splits child nodes into two groups: * rules, * rulesets. Rules are always printed first and have special handling for last rule. Rulesets are always printed second. Wrong ordering was caused by the condition that determined what is rule and what is ruleset. Issue less#2013: The condition made no difference between @charset and @page, because both are compiled into tree.Directive nodes. I added isRulesetLike method to the tree.Directive to differentiate between them. Issue less#1954: The condition treated all tree.Anonymous types as rules and caused them to float up. That is incorrect, because `@import (inline)` is compiled into tree.Anonymous too, but should be treated as ruleset and stay where it is.
| for (i = 0; i < this.rules.length; i++) { | ||
| rule = this.rules[i]; | ||
| if (rule.rules || (rule instanceof tree.Media) || rule instanceof tree.Directive || (this.root && rule instanceof tree.Comment)) { | ||
| // console.log(rule.type); | ||
| // if (rule.rules || (rule instanceof tree.Media) || rule instanceof tree.Directive || (this.root && rule instanceof tree.Comment)) { |
There was a problem hiding this comment.
I guess this should be deleted?
|
Thanks alot @SomMeri, looks good apart from the 2 stray comments |
|
Stray comments are removed now. |
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.
The genCss method of ruleset.js splits child nodes into two groups:
Rules are always printed first and have special handling for last rule.
Rulesets are always printed second. Wrong ordering was caused by the
condition that determined what is rule and what is ruleset.
Issue #2013: The condition made no difference between @charset and @page,
because both are compiled into tree.Directive nodes. I added isRulesetLike
method to the tree.Directive to differentiate between them.
Issue #1954: The condition treated all tree.Anonymous types as rules and
caused them to float up. That is incorrect, because
@import (inline)iscompiled into tree.Anonymous too, but should be treated as ruleset and
stay where it is.