[Pkg-javascript-commits] [less.js] 20/285: Merge branch 'master' into 2_0_0

[Jonas Smedegaard]

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

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

commit e8c78d9d406266a781cbc973c07de4ac0bfc8aa0
Merge: 868baa3 beb5273
Author: Luke Page <luke.a.page at gmail.com>
Date:   Sun Feb 23 17:38:39 2014 +0000

    Merge branch 'master' into 2_0_0
    
    Conflicts:
    	lib/less/browser.js
    	lib/less/parser.js

 CHANGELOG.md                                       |  5 +++++
 Gruntfile.js                                       |  8 ++++++++
 lib/less/browser.js                                | 20 ++++++++++++++++----
 lib/less/functions.js                              | 11 ++++++++++-
 lib/less/index.js                                  | 11 ++++++++---
 lib/less/parser.js                                 |  2 +-
 lib/less/tree/keyword.js                           |  1 +
 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 +++
 test/css/functions.css                             |  1 +
 test/less/errors/percentage-missing-space.less     |  3 +++
 test/less/errors/percentage-missing-space.txt      |  4 ++++
 test/less/functions.less                           |  1 +
 15 files changed, 73 insertions(+), 9 deletions(-)

diff --cc lib/less/browser.js
index 3e9e480,613a22e..7f2517d
--- a/lib/less/browser.js
+++ b/lib/less/browser.js
@@@ -55,9 -56,10 +56,9 @@@ if (dumpLineNumbers) 
  
  var typePattern = /^text\/(x-)?less$/;
  var cache = null;
 -var fileCache = {};
  
  function log(str, level) {
-     if (less.env == 'development' && typeof(console) !== 'undefined' && less.logLevel >= level) {
+     if (typeof(console) !== 'undefined' && less.logLevel >= level) {
          console.log('less: ' + str);
      }
  }
diff --cc lib/less/index.js
index d156090,d23b9ee..0138cd3
--- a/lib/less/index.js
+++ b/lib/less/index.js
@@@ -129,4 -249,4 +134,4 @@@ require('./join-selector-visitor.js')
  require('./to-css-visitor.js');
  require('./source-map-output.js');
  
- module.exports = less;
 -for (var k in less) { if (less.hasOwnProperty(k)) { exports[k] = less[k]; }}
++module.exports = less;
diff --cc lib/less/parser.js
index 0fa45b9,74f2ddd..b145d9c
--- a/lib/less/parser.js
+++ b/lib/less/parser.js
@@@ -820,9 -805,15 +820,9 @@@ less.Parser = function Parser(env) 
                  //     black border-collapse
                  //
                  keyword: function () {
-                     var k = $re(/^[_A-Za-z-][_A-Za-z0-9-]*/);
 -                    var k;
 -
 -                    k = $re(/^%|^[_A-Za-z-][_A-Za-z0-9-]*/);
++                    var k = $re(/^%|^[_A-Za-z-][_A-Za-z0-9-]*/);
                      if (k) {
 -                        var color = tree.Color.fromKeyword(k);
 -                        if (color) {
 -                            return color;
 -                        }
 -                        return new(tree.Keyword)(k);
 +                        return tree.Color.fromKeyword(k) || new(tree.Keyword)(k);
                      }
                  },
  

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