lib/less/js/lib/less/index.js in less-2.5.1 vs lib/less/js/lib/less/index.js in less-2.6.0

- old
+ new

@@ -2,11 +2,11 @@ url = require('url'), request, fs = require('fs'); var less = { - version: [1, 6, 3], + version: [1, 7, 0], Parser: require('./parser').Parser, tree: require('./tree'), render: function (input, options, callback) { options = options || {}; @@ -18,12 +18,17 @@ var parser = new(less.Parser)(options), ee; if (callback) { parser.parse(input, function (e, root) { - try { callback(e, root && root.toCSS && root.toCSS(options)); } - catch (err) { callback(err); } + if (e) { callback(e); return; } + var css; + try { + css = root && root.toCSS && root.toCSS(options); + } + catch (err) { callback(err); return; } + callback(null, css); }); } else { ee = new (require('events').EventEmitter)(); process.nextTick(function () { @@ -92,10 +97,11 @@ } }; require('./tree/color'); require('./tree/directive'); +require('./tree/detached-ruleset'); require('./tree/operation'); require('./tree/dimension'); require('./tree/keyword'); require('./tree/variable'); require('./tree/ruleset'); @@ -118,9 +124,10 @@ require('./tree/paren'); require('./tree/media'); require('./tree/unicode-descriptor'); require('./tree/negative'); require('./tree/extend'); +require('./tree/ruleset-call'); var isUrlRe = /^(?:https?:)?\/\//i; less.Parser.fileLoader = function (file, currentFileInfo, callback, env) {