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

Merge pull request #2575 from chipx86/fix-sync-loading

Browse Source 
Fix synchronously loading/applying stylesheets on page load.
This commit is contained in:
Luke Page
2015-04-29 08:20:33 +01:00
parent 5ad6fb3fc6 f66757554f
commit fbbd313bcf
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/less-browser/bootstrap.js vendored
View File

@@ -13,14 +13,13 @@ require("./add-default-options")(window, options);
var less = module.exports = require("./index")(window, options);
window.less = less;
if (options.onReady) {
if (/!watch/.test(window.location.hash)) {
less.watch();
}
less.pageLoadFinished = less.registerStylesheets().then(
function () {
return less.refresh(less.env === 'development');
}
);
}
less.registerStylesheetsImmediately();
less.pageLoadFinished = less.refresh(less.env === 'development');
}

30
lib/less-browser/index.js
View File

@@ -187,20 +187,28 @@ module.exports = function(window, options) {
less.unwatch = function () {clearInterval(less.watchTimer); this.watchMode = false; return false; };
//
// Get all <link> tags with the 'rel' attribute set to "stylesheet/less"
// Synchronously get all <link> tags with the 'rel' attribute set to
// "stylesheet/less".
//
less.registerStylesheetsImmediately = function() {
var links = document.getElementsByTagName('link');
less.sheets = [];
for (var i = 0; i < links.length; i++) {
if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) &&
(links[i].type.match(typePattern)))) {
less.sheets.push(links[i]);
}
}
};
//
// Asynchronously get all <link> tags with the 'rel' attribute set to
// "stylesheet/less", returning a Promise.
//
less.registerStylesheets = function() {
return new Promise(function(resolve, reject) {
var links = document.getElementsByTagName('link');
less.sheets = [];
for (var i = 0; i < links.length; i++) {
if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) &&
(links[i].type.match(typePattern)))) {
less.sheets.push(links[i]);
}
}
less.registerStylesheetsImmediately();
resolve();
});
};