mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-26 23:04:32 +02:00
Merge branch '3.0.0-wip' into bs3_theme
This commit is contained in:
@@ -13,7 +13,6 @@
|
|||||||
<script src="{{ page.base_url }}assets/js/less.js"></script>
|
<script src="{{ page.base_url }}assets/js/less.js"></script>
|
||||||
<script src="{{ page.base_url }}assets/js/jszip.js"></script>
|
<script src="{{ page.base_url }}assets/js/jszip.js"></script>
|
||||||
<script src="{{ page.base_url }}assets/js/uglify.js"></script>
|
<script src="{{ page.base_url }}assets/js/uglify.js"></script>
|
||||||
<script src="{{ page.base_url }}assets/js/jquery.bbq.min.js"></script>
|
|
||||||
<script src="{{ page.base_url }}assets/js/customizer.js"></script>
|
<script src="{{ page.base_url }}assets/js/customizer.js"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@@ -1,6 +1,47 @@
|
|||||||
window.onload = function () { // wait for load in a dumb way because B-0
|
window.onload = function () { // wait for load in a dumb way because B-0
|
||||||
var cw = '/*!\n * Bootstrap v3.0.0-rc.2\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n'
|
var cw = '/*!\n * Bootstrap v3.0.0-rc.2\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n'
|
||||||
|
|
||||||
|
function showError (msg, err) {
|
||||||
|
$('<div id="bsCustomizerAlert" class="bs-customizer-alert">\
|
||||||
|
<div class="container">\
|
||||||
|
<a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right">×</a>\
|
||||||
|
<p class="bs-customizer-alert-text">' + msg + '</p>' +
|
||||||
|
(err.extract ? '<pre class="bs-customizer-alert-extract">' + err.extract.join('\n') + '</pre>' : '') + '\
|
||||||
|
</div>\
|
||||||
|
</div>').appendTo('body').alert()
|
||||||
|
throw err
|
||||||
|
}
|
||||||
|
|
||||||
|
function getQueryParam(key) {
|
||||||
|
key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, "\\$&"); // escape RegEx meta chars
|
||||||
|
var match = location.search.match(new RegExp("[?&]"+key+"=([^&]+)(&|$)"));
|
||||||
|
return match && decodeURIComponent(match[1].replace(/\+/g, " "));
|
||||||
|
}
|
||||||
|
|
||||||
|
function createGist (configData) {
|
||||||
|
var data = {
|
||||||
|
"description": "Bootstrap Customizer Config",
|
||||||
|
"public": true,
|
||||||
|
"files": {
|
||||||
|
"config.json": {
|
||||||
|
"content": JSON.stringify(configData)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$.ajax({
|
||||||
|
url: 'https://api.github.com/gists',
|
||||||
|
type: 'POST',
|
||||||
|
dataType: 'json',
|
||||||
|
data: JSON.stringify(data)
|
||||||
|
})
|
||||||
|
.success(function(result) {
|
||||||
|
history.replaceState(false, document.title, window.location.origin + window.location.pathname + '?id=' + result.id)
|
||||||
|
})
|
||||||
|
.error(function(err) {
|
||||||
|
showError('<strong>Error</strong> Could not save gist file, configuration not saved.', err)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
function generateUrl() {
|
function generateUrl() {
|
||||||
var vars = {}
|
var vars = {}
|
||||||
|
|
||||||
@@ -11,39 +52,50 @@ window.onload = function () { // wait for load in a dumb way because B-0
|
|||||||
|
|
||||||
var data = {
|
var data = {
|
||||||
vars: vars,
|
vars: vars,
|
||||||
css: $('#less-section input:not(:checked)').map(function () { return this.value }).toArray(),
|
css: $('#less-section input:checked') .map(function () { return this.value }).toArray(),
|
||||||
js: $('#plugin-section input:not(:checked)').map(function () { return this.value }).toArray()
|
js: $('#plugin-section input:checked').map(function () { return this.value }).toArray()
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($.isEmptyObject(data.vars) && !data.css.length && !data.js.length) return
|
if ($.isEmptyObject(data.vars) && !data.css.length && !data.js.length) return
|
||||||
|
|
||||||
window.location = jQuery.param.querystring('/customize/', data)
|
createGist(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseUrl() {
|
function parseUrl() {
|
||||||
var data = jQuery.deparam.querystring()
|
var id = getQueryParam('id')
|
||||||
|
|
||||||
if (data.js) {
|
if (!id) return
|
||||||
for (var i = 0; i < data.js.length; i++) {
|
|
||||||
var input = $('input[value="'+data.js[i]+'"]')
|
$.ajax({
|
||||||
input && input.prop('checked', false)
|
url: 'https://api.github.com/gists/' + id,
|
||||||
|
type: 'GET',
|
||||||
|
dataType: 'json'
|
||||||
|
})
|
||||||
|
.success(function(result) {
|
||||||
|
var data = JSON.parse(result.files['config.json'].content)
|
||||||
|
if (data.js) {
|
||||||
|
$('#plugin-section input').each(function () {
|
||||||
|
$(this).prop('checked', ~$.inArray(this.value, data.js))
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
if (data.css) {
|
||||||
|
$('#less-section input').each(function () {
|
||||||
if (data.css) {
|
$(this).prop('checked', ~$.inArray(this.value, data.css))
|
||||||
for (var i = 0; i < data.css.length; i++) {
|
})
|
||||||
var input = $('input[value="'+data.css[i]+'"]')
|
|
||||||
input && input.prop('checked', false)
|
|
||||||
}
|
}
|
||||||
}
|
if (data.vars) {
|
||||||
|
for (var i in data.vars) {
|
||||||
if (data.vars) {
|
$('input[data-var="' + i + '"]').val(data.vars[i])
|
||||||
// todo (fat): vars
|
}
|
||||||
}
|
}
|
||||||
|
})
|
||||||
|
.error(function(err) {
|
||||||
|
showError('Error fetching bootstrap config file', err)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function generateZip(css, js, complete) {
|
function generateZip(css, js, complete) {
|
||||||
if (!css && !js) return alert('you want to build nothing… o_O')
|
if (!css && !js) return showError('<strong>Error</strong> No Bootstrap files selected.', new Error('no Bootstrap'))
|
||||||
|
|
||||||
var zip = new JSZip()
|
var zip = new JSZip()
|
||||||
|
|
||||||
@@ -108,15 +160,16 @@ window.onload = function () { // wait for load in a dumb way because B-0
|
|||||||
, optimization: 0
|
, optimization: 0
|
||||||
, filename: 'bootstrap.css'
|
, filename: 'bootstrap.css'
|
||||||
}).parse(css, function (err, tree) {
|
}).parse(css, function (err, tree) {
|
||||||
if (err) return alert(err)
|
if (err) {
|
||||||
|
return showError('<strong>Error</strong> Could not parse less files.', err)
|
||||||
|
}
|
||||||
result = {
|
result = {
|
||||||
'bootstrap.css' : cw + tree.toCSS(),
|
'bootstrap.css' : cw + tree.toCSS(),
|
||||||
'bootstrap.min.css' : cw + tree.toCSS({ compress: true })
|
'bootstrap.min.css' : cw + tree.toCSS({ compress: true })
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return alert(err)
|
return showError('<strong>Error</strong> Could not parse less files.', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return result
|
return result
|
||||||
@@ -142,9 +195,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
|
|||||||
$downloadBtn.addClass('loading')
|
$downloadBtn.addClass('loading')
|
||||||
generateZip(generateCSS(), generateJavascript(), function () {
|
generateZip(generateCSS(), generateJavascript(), function () {
|
||||||
$downloadBtn.removeClass('loading')
|
$downloadBtn.removeClass('loading')
|
||||||
setTimeout(function () {
|
setTimeout(generateUrl, 500)
|
||||||
generateUrl()
|
|
||||||
}, 1)
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -167,9 +218,5 @@ window.onload = function () { // wait for load in a dumb way because B-0
|
|||||||
inputsVariables.val('')
|
inputsVariables.val('')
|
||||||
})
|
})
|
||||||
|
|
||||||
try {
|
parseUrl()
|
||||||
parseUrl()
|
|
||||||
} catch (e) {
|
|
||||||
// maybe alert user that we can't parse their url
|
|
||||||
}
|
|
||||||
}
|
}
|
1287
assets/js/jquery.bbq.min.js
vendored
1287
assets/js/jquery.bbq.min.js
vendored
File diff suppressed because it is too large
Load Diff
540
customize.html
540
customize.html
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user