From: Chris Rebert Date: Fri, 28 Mar 2014 04:28:21 +0000 (-0700) Subject: enhance customizer to handle transitive Less @import-s X-Git-Tag: v3.2.0~295^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07314b5475e9aec63f490c266a011ec0b80cb339;p=thirdparty%2Fbootstrap.git enhance customizer to handle transitive Less @import-s --- diff --git a/docs/assets/js/_src/customizer.js b/docs/assets/js/_src/customizer.js index 596687b09c..06338b1ef5 100644 --- a/docs/assets/js/_src/customizer.js +++ b/docs/assets/js/_src/customizer.js @@ -181,10 +181,20 @@ window.onload = function () { // wait for load in a dumb way because B-0 var IMPORT_REGEX = /^@import \"(.*?)\";$/ var lessLines = __less[lessFilename].split('\n') - for (var i = 0, imports = []; i < lessLines.length; i++) { - var match = IMPORT_REGEX.exec(lessLines[i]) - if (match) imports.push(match[1]) - } + var imports = [] + $.each(lessLines, function (index, lessLine) { + var match = IMPORT_REGEX.exec(lessLine) + if (match) { + var importee = match[1] + var transitiveImports = includedLessFilenames(importee) + $.each(transitiveImports, function (index, transitiveImportee) { + if ($.inArray(transitiveImportee, imports) === -1) { + imports.push(transitiveImportee) + } + }) + imports.push(importee) + } + }) return imports } @@ -192,7 +202,8 @@ window.onload = function () { // wait for load in a dumb way because B-0 function generateLESS(lessFilename, lessFileIncludes, vars) { var lessSource = __less[lessFilename] - $.each(includedLessFilenames(lessFilename), function(index, filename) { + var lessFilenames = includedLessFilenames(lessFilename) + $.each(lessFilenames, function(index, filename) { var fileInclude = lessFileIncludes[filename] // Files not explicitly unchecked are compiled into the final stylesheet.