github/less.js
1
1
Fork 0
mirror of https://github.com/less/less.js.git synced 2026-02-05 20:44:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

improve import support with media features

Browse Source
This commit is contained in:
Alexis Sellier
2012-01-05 21:31:39 +01:00
parent d8441445a5
commit 7dd31ff654
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/less/tree/directive.js
View File

@@ -6,6 +6,7 @@ tree.Directive = function (name, value, features) {
if (Array.isArray(value)) {
this.ruleset = new(tree.Ruleset)([], value);
this.ruleset.allowImports = true;
} else {
this.value = value;
}

7
lib/less/tree/import.js
View File

@@ -57,13 +57,12 @@ tree.Import.prototype = {
}
},
eval: function (env) {
var ruleset;
var ruleset, features = this.features && this.features.eval(env);
if (this.css) {
this.features = this.features && this.features.eval(env);
return this;
} else {
ruleset = new(tree.Ruleset)(null, this.root.rules.slice(0));
ruleset = new(tree.Ruleset)([], this.root.rules.slice(0));
for (var i = 0; i < ruleset.rules.length; i++) {
if (ruleset.rules[i] instanceof tree.Import) {
@@ -73,7 +72,7 @@ tree.Import.prototype = {
[i, 1].concat(ruleset.rules[i].eval(env)));
}
}
return ruleset.rules;
return this.features ? new(tree.Directive)('@media', ruleset.rules, this.features.value) : ruleset.rules;
}
}
};

3
lib/less/tree/ruleset.js
View File

@@ -11,12 +11,13 @@ tree.Ruleset.prototype = {
var ruleset = new(tree.Ruleset)(selectors, this.rules.slice(0));
ruleset.root = this.root;
ruleset.allowImports = this.allowImports;
// push the current ruleset to the frames stack
env.frames.unshift(ruleset);
// Evaluate imports
if (ruleset.root) {
if (ruleset.root || ruleset.allowImports) {
for (var i = 0; i < ruleset.rules.length; i++) {
if (ruleset.rules[i] instanceof tree.Import) {
Array.prototype.splice