From 081c26dc9ad19f558abbe8b7955209eeeffcacc3 Mon Sep 17 00:00:00 2001 From: Marcel Jackwerth Date: Fri, 17 Feb 2012 01:42:22 +0100 Subject: [PATCH] adjusted indent-whitespace to 4 spaces --- lib/less/tree/media.js | 112 ++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/lib/less/tree/media.js b/lib/less/tree/media.js index e86ec5b2..4b5d44db 100644 --- a/lib/less/tree/media.js +++ b/lib/less/tree/media.js @@ -19,8 +19,8 @@ tree.Media.prototype = { }, eval: function (env) { if (!env.mediaBlocks) { - env.mediaBlocks = []; - env.mediaPath = []; + env.mediaBlocks = []; + env.mediaPath = []; } env.mediaBlocks.push(this); @@ -34,9 +34,9 @@ tree.Media.prototype = { env.mediaPath.pop(); if (env.mediaPath.length === 0) { - return this.evalTop(env); + return this.evalTop(env); } else { - return this.evalNested(env); + return this.evalNested(env); } }, variable: function (name) { return tree.Ruleset.prototype.variable.call(this.ruleset, name) }, @@ -44,68 +44,68 @@ tree.Media.prototype = { rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.ruleset) }, evalTop: function (env) { - var result = this; + var result = this; - // Render all dependent Media blocks. - if (env.mediaBlocks.length > 1) { - var el = new(tree.Element)('&', null, 0); - var selectors = [new(tree.Selector)([el])]; - result = new(tree.Ruleset)(selectors, env.mediaBlocks); - result.multiMedia = true; - } - - delete env.mediaBlocks; - delete env.mediaPath; - - return result; - }, - evalNested: function (env) { - var i, value, - path = env.mediaPath.concat([this]); - - // Extract the media-query conditions separated with `,` (OR). - for (i = 0; i < path.length; i++) { - value = path[i].features instanceof tree.Value ? - path[i].features.value : path[i].features; - path[i] = Array.isArray(value) ? value : [value]; - } - - // Trace all permutations to generate the resulting media-query. - // - // (a, b and c) with nested (d, e) -> - // a and d - // a and e - // b and c and d - // b and c and e - this.features = new(tree.Value)(this.permute(path).map(function (path) { - path = path.map(function (fragment) { - return fragment.toCSS ? fragment : new(tree.Anonymous)(fragment); - }); - - for(i = path.length - 1; i > 0; i--) { - path.splice(i, 0, new(tree.Anonymous)("and")); + // Render all dependent Media blocks. + if (env.mediaBlocks.length > 1) { + var el = new(tree.Element)('&', null, 0); + var selectors = [new(tree.Selector)([el])]; + result = new(tree.Ruleset)(selectors, env.mediaBlocks); + result.multiMedia = true; } - return new(tree.Expression)(path); - })); + delete env.mediaBlocks; + delete env.mediaPath; - // Fake a tree-node that doesn't output anything. - return new(tree.Ruleset)([], []); + return result; + }, + evalNested: function (env) { + var i, value, + path = env.mediaPath.concat([this]); + + // Extract the media-query conditions separated with `,` (OR). + for (i = 0; i < path.length; i++) { + value = path[i].features instanceof tree.Value ? + path[i].features.value : path[i].features; + path[i] = Array.isArray(value) ? value : [value]; + } + + // Trace all permutations to generate the resulting media-query. + // + // (a, b and c) with nested (d, e) -> + // a and d + // a and e + // b and c and d + // b and c and e + this.features = new(tree.Value)(this.permute(path).map(function (path) { + path = path.map(function (fragment) { + return fragment.toCSS ? fragment : new(tree.Anonymous)(fragment); + }); + + for(i = path.length - 1; i > 0; i--) { + path.splice(i, 0, new(tree.Anonymous)("and")); + } + + return new(tree.Expression)(path); + })); + + // Fake a tree-node that doesn't output anything. + return new(tree.Ruleset)([], []); }, permute: function (arr) { if (arr.length == 0) { - return []; + return []; } else if (arr.length == 1) { - return arr[0]; + return arr[0]; } else { - var result = []; - var rest = this.permute(arr.slice(1)); - for (var i = 0; i < rest.length; i++) { - for (var j = 0; j < arr[0].length; j++) { - result.push([arr[0][j]].concat(rest[i])); + var result = []; + var rest = this.permute(arr.slice(1)); + for (var i = 0; i < rest.length; i++) { + for (var j = 0; j < arr[0].length; j++) { + result.push([arr[0][j]].concat(rest[i])); + } } - } - return result; + return result; } } };