From: Stuart P. Bentley Date: Sat, 14 Sep 2013 08:26:42 +0000 (-0400) Subject: Customizer: include config.json in bootstrap.zip X-Git-Tag: v3.0.1~39^2~84 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58a47b6bfd274e7018316c0ea77ce0ca40a7e53f;p=thirdparty%2Fbootstrap.git Customizer: include config.json in bootstrap.zip merges #10633; fixes part of #9951 --- diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 5abfe42280..cc772d222c 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -31,13 +31,13 @@ window.onload = function () { // wait for load in a dumb way because B-0 return match && decodeURIComponent(match[1].replace(/\+/g, " ")); } - function createGist(configData) { + function createGist(configJson) { var data = { "description": "Bootstrap Customizer Config", "public": true, "files": { "config.json": { - "content": JSON.stringify(configData, null, 2) + "content": configJson } } } @@ -107,7 +107,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 }) } - function generateZip(css, js, fonts, complete) { + function generateZip(css, js, fonts, config, complete) { if (!css && !js) return showError('Ruh roh! No Bootstrap files selected.', new Error('no Bootstrap')) var zip = new JSZip() @@ -133,6 +133,10 @@ window.onload = function () { // wait for load in a dumb way because B-0 } } + if (config) { + zip.file('config.json', config) + } + var content = zip.generate({type:"blob"}) complete(content) @@ -262,14 +266,17 @@ window.onload = function () { // wait for load in a dumb way because B-0 var $downloadBtn = $('#btn-download') $compileBtn.on('click', function (e) { + var configData = getCustomizerData() + var configJson = JSON.stringify(configData, null, 2) + e.preventDefault() $compileBtn.attr('disabled', 'disabled') - generateZip(generateCSS(), generateJavascript(), generateFonts(), function (blob) { + generateZip(generateCSS(), generateJavascript(), generateFonts(), configJson, function (blob) { $compileBtn.removeAttr('disabled') saveAs(blob, "bootstrap.zip") - createGist(getCustomizerData()) + createGist(configJson) }) })