[Pkg-javascript-commits] [less.js] 75/88: Merge branch 'master' of https://github.com/cloudchen/less.js

[Jonas Smedegaard]

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

js pushed a commit to annotated tag v1.7.0
in repository less.js.

commit 2a194e03d0db32e2eca34d7d5f84177266b8aa26
Merge: 6f3f59c 0a79543
Author: Luke Page <luke.a.page at gmail.com>
Date:   Sun Feb 23 08:30:50 2014 +0000

    Merge branch 'master' of https://github.com/cloudchen/less.js
    
    Conflicts:
    	lib/less/browser.js

 Gruntfile.js                                       |  8 ++++++++
 lib/less/browser.js                                | 15 +++++++++++++--
 test/browser/css/postProcessor/postProcessor.css   |  4 ++++
 test/browser/less/postProcessor/postProcessor.less |  4 ++++
 test/browser/runner-postProcessor-options.js       |  4 ++++
 test/browser/runner-postProcessor.js               |  3 +++
 6 files changed, 36 insertions(+), 2 deletions(-)

diff --cc lib/less/browser.js
index 63fdde0,f89eb9e..b5902ca
--- a/lib/less/browser.js
+++ b/lib/less/browser.js
@@@ -645,8 -653,10 +654,10 @@@ less.refresh = function (reload, modify
          if (env.local) {
              log("loading " + sheet.href + " from cache.", logLevel.info);
          } else {
 -            log("parsed " + sheet.href + " successfully.", logLevel.info);
 +            log("parsed " + sheet.href + " successfully.", logLevel.debug);
-             createCSS(root.toCSS(less), sheet, env.lastModified);
+             var styles = root.toCSS(less);
+             styles = postProcessCSS(styles);
+             createCSS(styles, sheet, env.lastModified);
          }
          log("css for " + sheet.href + " generated in " + (new Date() - endTime) + 'ms', logLevel.info);
          if (env.remaining === 0) {

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