Merge pull request #3257 from matthew-dean/bugfix-3182

Fixes #3182
less · Jul 6, 2018 · be048e7 · be048e7
2 parents c20e8ce + 6fa7980
commit be048e7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/lib/less/tree/javascript.js b/lib/less/tree/javascript.js
@@ -13,10 +13,11 @@ JavaScript.prototype = new JsEvalNode();
 JavaScript.prototype.type = 'JavaScript';
 JavaScript.prototype.eval = function(context) {
  var result = this.evaluateJavaScript(this.expression, context);
+ var type = typeof result;
 
- if (typeof result === 'number') {
+ if (type === 'number' && !isNaN(result)) {
  return new Dimension(result);
- } else if (typeof result === 'string') {
+ } else if (type === 'string') {
  return new Quoted('"' + result + '"', result, this.escaped, this._index);
  } else if (Array.isArray(result)) {
  return new Anonymous(result.join(', '));

diff --git a/test/css/javascript.css b/test/css/javascript.css
@@ -8,6 +8,7 @@
  multiline: 2;
 }
 .scope {
+ empty: ;
  var: 42;
  escaped: 7px;
 }

diff --git a/test/less/javascript.less b/test/less/javascript.less
@@ -9,6 +9,7 @@
  return x})()`;
 }
 .scope {
+ empty: `+function(){}`;
  @foo: 42;
  var: `parseInt(this.foo.toJS())`;
  escaped: ~`2 + 5 + 'px'`;