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

Merge branch 'master' into 2_0_0

Browse Source 
Conflicts:
	lib/less/browser.js
This commit is contained in:
Luke Page
2014-02-23 08:28:10 +00:00
parent 010653624f 6f3f59cd57
commit 868baa301f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/less/browser.js
View File

@@ -14,6 +14,7 @@ less.env = less.env || (location.hostname == '127.0.0.1' ||
: 'production');
var logLevel = {
debug: 3,
info: 2,
errors: 1,
none: 0
@@ -24,7 +25,7 @@ var logLevel = {
// 1 - Errors
// 0 - None
// Defaults to 2
less.logLevel = typeof(less.logLevel) != 'undefined' ? less.logLevel : logLevel.info;
less.logLevel = typeof(less.logLevel) != 'undefined' ? less.logLevel : logLevel.debug;
// Load styles asynchronously (default: false)
//
@@ -457,12 +458,12 @@ less.refresh = function (reload, modifyVars) {
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);
}
log("css for " + sheet.href + " generated in " + (new Date() - endTime) + 'ms', logLevel.info);
if (env.remaining === 0) {
log("css generated in " + (new Date() - startTime) + 'ms', logLevel.info);
log("less has finished. css generated in " + (new Date() - startTime) + 'ms', logLevel.info);
}
endTime = new Date();
}, reload, modifyVars);

2
lib/less/environments/browser.js
View File

@@ -123,7 +123,7 @@ less.Parser.environment = {
if (typeof(xhr.overrideMimeType) === 'function') {
xhr.overrideMimeType('text/css');
}
log("XHR: Getting '" + url + "'", logLevel.info);
log("XHR: Getting '" + url + "'", logLevel.debug);
xhr.open('GET', url, async);
xhr.setRequestHeader('Accept', type || 'text/x-less, text/css; q=0.9, */*; q=0.5');
xhr.send(null);