[Pkg-javascript-commits] [less.js] 57/58: Merge branch 'master' of https://github.com/lejenome/less.js

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag v2.3.0
in repository less.js.

commit d70071546ec18bdd85d97d98832a2c9ca381c64b
Merge: 31c3d04 e000c78
Author: Luke Page <luke.a.page at gmail.com>
Date:   Mon Jan 26 23:40:14 2015 +0000

    Merge branch 'master' of https://github.com/lejenome/less.js
    
    Conflicts:
    	lib/less/render.js

 lib/less/parse.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc lib/less/parse.js
index 0991824,4dce5ef..d0f7f0c
--- a/lib/less/parse.js
+++ b/lib/less/parse.js
@@@ -46,16 -43,26 +46,20 @@@ module.exports = function(environment, 
                      entryPath: entryPath,
                      rootFilename: filename
                  };
++                // add in a missing trailing slash
++                if (rootFileInfo.rootpath && rootFileInfo.rootpath.slice(-1) !== "/") {
++                    rootFileInfo.rootpath += "/";
++                }
              }
  
 -            if (rootFileInfo.rootpath && rootFileInfo.rootpath.slice(-1) !== "/")
 -                rootFileInfo.rootpath += "/";
 -
              var imports = new ImportManager(context, rootFileInfo);
 -            var parser = new Parser(context, imports, rootFileInfo);
  
 -            return new PromiseConstructor(function (resolve, reject) {
 -                parser.parse(input, function (e, root) {
 -                    if (e) { return reject(e); }
 -                    try {
 -                        var parseTree = new ParseTree(root, imports);
 -                        var result = parseTree.toCSS(options);
 -                        resolve(result);
 -                    }
 -                    catch (err) { reject( err); }
 -                }, options);
 -            });
 +            new Parser(context, imports, rootFileInfo)
 +                .parse(input, function (e, root) {
 +                if (e) { return callback(e); }
 +                callback(null, root, imports, options);
 +            }, options);
          }
      };
 -    return render;
 +    return parse;
  };

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/less.js.git