Skip to content

Commit 80e8b42

Browse files
committed
remove @media code from tree.Directive
1 parent 53b67e7 commit 80e8b42

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

lib/less/tree/directive.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,27 @@
11
(function (tree) {
22

33
tree.Directive = function (name, value, features) {
4-
var selectors;
5-
64
this.name = name;
7-
this.features = features && new(tree.Value)(features);
85

96
if (Array.isArray(value)) {
10-
selectors = name === '@media' ? [new(tree.Selector)([new(tree.Element)('&', null, 0)])] : [];
11-
this.ruleset = new(tree.Ruleset)(selectors, value);
7+
this.ruleset = new(tree.Ruleset)([], value);
128
this.ruleset.allowImports = true;
139
} else {
1410
this.value = value;
1511
}
1612
};
1713
tree.Directive.prototype = {
1814
toCSS: function (ctx, env) {
19-
var features = this.features ? ' ' + this.features.toCSS(env) : '';
20-
2115
if (this.ruleset) {
22-
this.ruleset.root = ctx.length === 0 || (this.name !== '@media');
23-
return this.name + features + (env.compress ? '{' : ' {\n ') +
16+
this.ruleset.root = true;
17+
return this.name + (env.compress ? '{' : ' {\n ') +
2418
this.ruleset.toCSS(ctx, env).trim().replace(/\n/g, '\n ') +
2519
(env.compress ? '}': '\n}\n');
2620
} else {
2721
return this.name + ' ' + this.value.toCSS() + ';\n';
2822
}
2923
},
3024
eval: function (env) {
31-
this.features = this.features && this.features.eval(env);
3225
env.frames.unshift(this);
3326
this.ruleset = this.ruleset && this.ruleset.eval(env);
3427
env.frames.shift();

lib/less/tree/import.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ tree.Import.prototype = {
7171
[i, 1].concat(ruleset.rules[i].eval(env)));
7272
}
7373
}
74-
return this.features ? new(tree.Directive)('@media', ruleset.rules, this.features.value) : ruleset.rules;
74+
return this.features ? new(tree.Media)(ruleset.rules, this.features.value) : ruleset.rules;
7575
}
7676
}
7777
};

0 commit comments

Comments
 (0)