Merge branch 'parse-add-variables' of https://github.com/joscha/less.js

Conflicts:
	lib/less/parser.js
	test/less-test.js
This commit is contained in:
Luke Page
2013-12-20 16:41:27 +00:00
9 changed files with 72 additions and 16 deletions

View File

@@ -595,16 +595,6 @@ function initRunningMode(){
}
}
function serializeVars(vars) {
var s = "";
for (var name in vars) {
s += ((name.slice(0,1) === '@')? '' : '@') + name +': '+
((vars[name].slice(-1) === ';')? vars[name] : vars[name] +';');
}
return s;
}
//
@@ -650,7 +640,7 @@ for (var i = 0; i < links.length; i++) {
// CSS without reloading less-files
//
less.modifyVars = function(record) {
less.refresh(false, serializeVars(record));
less.refresh(false, less.Parser.serializeVars(record));
};
less.refresh = function (reload, newVars) {
@@ -678,7 +668,7 @@ less.refresh = function (reload, newVars) {
};
if (less.globalVars) {
varsPre = serializeVars(less.globalVars) + "\n";
varsPre = less.Parser.serializeVars(less.globalVars) + "\n";
}
less.refreshStyles = loadStyles;