From 3f9076399536adac4bd34e9b0e666ab12e5d0b53 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 28 Mar 2014 20:05:59 +0200 Subject: Customizer: switch to UglifyJS2 (v2.4.13). The uglify build is generated with `uglifyjs --self -o uglify.min.js`. --- docs/assets/js/_src/customizer.js | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'docs/assets/js/_src') diff --git a/docs/assets/js/_src/customizer.js b/docs/assets/js/_src/customizer.js index ac314dc73..201f6e178 100644 --- a/docs/assets/js/_src/customizer.js +++ b/docs/assets/js/_src/customizer.js @@ -276,7 +276,24 @@ window.onload = function () { // wait for load in a dumb way because B-0 return result } - function generateJavascript(preamble) { + function uglify(js) { + var ast = UglifyJS.parse(js) + ast.figure_out_scope() + + var compressor = UglifyJS.Compressor() + var compressedAst = ast.transform(compressor) + + compressedAst.figure_out_scope() + compressedAst.compute_char_frequency() + compressedAst.mangle_names() + + var stream = UglifyJS.OutputStream() + compressedAst.print(stream) + + return stream.toString() + } + + function generateJS(preamble) { var $checked = $('#plugin-section input:checked') if (!$checked.length) return false @@ -351,7 +368,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 ' * Config saved to config.json and ' + gistUrl + '\n' + ' */\n' - generateZip(generateCSS(preamble), generateJavascript(preamble), generateFonts(), configJson, function (blob) { + generateZip(generateCSS(preamble), generateJS(preamble), generateFonts(), configJson, function (blob) { $compileBtn.removeAttr('disabled') saveAs(blob, 'bootstrap.zip') }) -- cgit v1.2.3 From 7950c0ff0ae216fbcb7f24f3fd93eae34ba6b4a6 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 28 Mar 2014 20:08:42 +0200 Subject: Add the jquery check in customizer's output. --- docs/assets/js/_src/customizer.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/js/_src') diff --git a/docs/assets/js/_src/customizer.js b/docs/assets/js/_src/customizer.js index 201f6e178..5494aa527 100644 --- a/docs/assets/js/_src/customizer.js +++ b/docs/assets/js/_src/customizer.js @@ -295,6 +295,8 @@ window.onload = function () { // wait for load in a dumb way because B-0 function generateJS(preamble) { var $checked = $('#plugin-section input:checked') + var jqueryCheck = 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap\'s JavaScript requires jQuery") }\n\n' + if (!$checked.length) return false var js = $checked @@ -302,6 +304,8 @@ window.onload = function () { // wait for load in a dumb way because B-0 .toArray() .join('\n') + js = jqueryCheck + js + return { 'bootstrap.js': preamble + js, 'bootstrap.min.js': preamble + cw + uglify(js) -- cgit v1.2.3 From 2c16b3151c3054381c97e9f9e7ab7dea3dcdbefd Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 28 Mar 2014 20:11:23 +0200 Subject: Add the license header in the non minified build too. --- docs/assets/js/_src/customizer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/js/_src') diff --git a/docs/assets/js/_src/customizer.js b/docs/assets/js/_src/customizer.js index 5494aa527..033e1c9c9 100644 --- a/docs/assets/js/_src/customizer.js +++ b/docs/assets/js/_src/customizer.js @@ -304,11 +304,12 @@ window.onload = function () { // wait for load in a dumb way because B-0 .toArray() .join('\n') + preamble = cw + preamble js = jqueryCheck + js return { 'bootstrap.js': preamble + js, - 'bootstrap.min.js': preamble + cw + uglify(js) + 'bootstrap.min.js': preamble + uglify(js) } } -- cgit v1.2.3