aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfat <[email protected]>2013-08-17 19:04:41 -0700
committerfat <[email protected]>2013-08-17 19:04:41 -0700
commit00d2986858832c3759778adfa31757f846a46b59 (patch)
treeb22523d89b124011de1b913ee7f31b4386403d92
parenta39cb4be909c667ade97f6575dd904f1ba34d96f (diff)
downloadbootstrap-00d2986858832c3759778adfa31757f846a46b59.tar.xz
bootstrap-00d2986858832c3759778adfa31757f846a46b59.zip
add logging
-rw-r--r--assets/js/customizer.js30
-rw-r--r--customize.html10
2 files changed, 21 insertions, 19 deletions
diff --git a/assets/js/customizer.js b/assets/js/customizer.js
index 46503eda6..c5cfedd99 100644
--- a/assets/js/customizer.js
+++ b/assets/js/customizer.js
@@ -1,6 +1,17 @@
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'
+ function showError (msg, err) {
+ $('<div id="bsCustomizerAlert" class="bs-customizer-alert">\
+ <div class="container">\
+ <a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right">&times;</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+"=([^&]+)(&|$)"));
@@ -23,11 +34,11 @@ window.onload = function () { // wait for load in a dumb way because B-0
dataType: 'json',
data: JSON.stringify(data)
})
- .success( function(e) {
+ .success(function(err) {
history.replaceState(false, document.title, window.location.origin + window.location.pathname + '?id=' + e.id)
})
- .error( function(e) {
- console.warn("gist save error", e);
+ .error(function(err) {
+ showError('<strong>Error</strong> Could not save gist file, configuration not saved.', err)
})
}
@@ -78,13 +89,13 @@ window.onload = function () { // wait for load in a dumb way because B-0
}
}
})
- .error(function(result) {
- console.warn("gist save error", e)
+ .error(function(err) {
+ showError('Error fetching bootstrap config file', err)
})
}
function generateZip(css, js, complete) {
- if (!css && !js) return console.warn('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()
@@ -149,15 +160,16 @@ window.onload = function () { // wait for load in a dumb way because B-0
, optimization: 0
, filename: 'bootstrap.css'
}).parse(css, function (err, tree) {
- if (err) return console.warn(err)
-
+ if (err) {
+ return showError('<strong>Error</strong> Could not parse less files.', err)
+ }
result = {
'bootstrap.css' : cw + tree.toCSS(),
'bootstrap.min.css' : cw + tree.toCSS({ compress: true })
}
})
} catch (err) {
- return console.warn(err)
+ return showError('<strong>Error</strong> Could not parse less files.', err)
}
return result
diff --git a/customize.html b/customize.html
index b9115deac..c55475ba8 100644
--- a/customize.html
+++ b/customize.html
@@ -6,16 +6,6 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
base_url: "../"
---
-
-<!-- Customizer errors -->
-<div class="bs-customizer-alert" style="display: none;">
- <div class="container">
- <button type="button" class="close pull-right">&times;</button>
- <p class="bs-customizer-alert-text"></p>
- </div>
-</div>
-
-
<!-- Customizer form -->
<form class="bs-customizer" role="form">
<div class="bs-docs-section" id="less-section">