github/less.js
1
1
Fork 0
mirror of https://github.com/less/less.js.git synced 2026-05-01 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/less/less.js into rhino

Browse Source 
Conflicts:
	.gitattributes
	README.md
	test/index.js
This commit is contained in:
meri
2014-01-14 22:48:46 +01:00
parent 9dde8527e9 ab486f7e1f
commit 85197ee577
101 changed files with 17646 additions and 994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/less/tree/javascript.js
View File

@@ -23,14 +23,17 @@ tree.JavaScript.prototype = {
index: this.index };
}
for (var k in env.frames[0].variables()) {
/*jshint loopfunc:true */
context[k.slice(1)] = {
value: env.frames[0].variables()[k].value,
toJS: function () {
return this.value.eval(env).toCSS();
}
};
var variables = env.frames[0].variables();
for (var k in variables) {
if (variables.hasOwnProperty(k)) {
/*jshint loopfunc:true */
context[k.slice(1)] = {
value: variables[k].value,
toJS: function () {
return this.value.eval(env).toCSS();
}
};
}
}
try {
@@ -39,7 +42,9 @@ tree.JavaScript.prototype = {
throw { message: "JavaScript evaluation error: '" + e.name + ': ' + e.message.replace(/["]/g, "'") + "'" ,
index: this.index };
}
if (typeof(result) === 'string') {
if (typeof(result) === 'number') {
return new(tree.Dimension)(result);
} else if (typeof(result) === 'string') {
return new(tree.Quoted)('"' + result + '"', result, this.escaped, this.index);
} else if (Array.isArray(result)) {
return new(tree.Anonymous)(result.join(', '));