Skip to content

Commit

Permalink
moved @media code to own file
Browse files Browse the repository at this point in the history
  • Loading branch information
NDMarcel committed Feb 16, 2012
1 parent 378ddef commit 53b67e7
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 3 deletions.
3 changes: 2 additions & 1 deletion lib/less/index.js
Expand Up @@ -82,7 +82,8 @@ var less = {
'selector', 'quoted', 'expression', 'rule',
'call', 'url', 'alpha', 'import',
'mixin', 'comment', 'anonymous', 'value',
'javascript', 'assignment', 'condition', 'paren'
'javascript', 'assignment', 'condition', 'paren',
'media'
].forEach(function (n) {
require('./tree/' + n);
});
Expand Down
2 changes: 1 addition & 1 deletion lib/less/parser.js
Expand Up @@ -1089,7 +1089,7 @@ less.Parser = function Parser(env) {
features = $(this.mediaFeatures);

if (rules = $(this.block)) {
return new(tree.Directive)('@media', rules, features);
return new(tree.Media)(rules, features);
}
}
},
Expand Down
41 changes: 41 additions & 0 deletions lib/less/tree/media.js
@@ -0,0 +1,41 @@
(function (tree) {

tree.Media = function (value, features) {
var selectors;

this.features = features && new(tree.Value)(features);

if (Array.isArray(value)) {
selectors = [new(tree.Selector)([new(tree.Element)('&', null, 0)])];
this.ruleset = new(tree.Ruleset)(selectors, value);
this.ruleset.allowImports = true;
} else {
this.value = value;
}
};
tree.Media.prototype = {
toCSS: function (ctx, env) {
var features = this.features ? ' ' + this.features.toCSS(env) : '';

if (this.ruleset) {
this.ruleset.root = (ctx.length === 0);
return '@media' + features + (env.compress ? '{' : ' {\n ') +
this.ruleset.toCSS(ctx, env).trim().replace(/\n/g, '\n ') +
(env.compress ? '}': '\n}\n');
} else {
return '@media ' + this.value.toCSS() + ';\n';
}
},
eval: function (env) {
this.features = this.features && this.features.eval(env);
env.frames.unshift(this);
this.ruleset = this.ruleset && this.ruleset.eval(env);
env.frames.shift();
return this;
},
variable: function (name) { return tree.Ruleset.prototype.variable.call(this.ruleset, name) },
find: function () { return tree.Ruleset.prototype.find.apply(this.ruleset, arguments) },
rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.ruleset) }
};

})(require('../tree'));
2 changes: 1 addition & 1 deletion lib/less/tree/ruleset.js
Expand Up @@ -130,7 +130,7 @@ tree.Ruleset.prototype = {
for (var i = 0; i < this.rules.length; i++) {
rule = this.rules[i];

if (rule.rules || (rule instanceof tree.Directive)) {
if (rule.rules || (rule instanceof tree.Directive) || (rule instanceof tree.Media)) {
rulesets.push(rule.toCSS(paths, env));
} else if (rule instanceof tree.Comment) {
if (!rule.silent) {
Expand Down

0 comments on commit 53b67e7

Please sign in to comment.