Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
d8cfcad7
Commit
d8cfcad7
authored
11 years ago
by
XhmikosR
Browse files
Options
Download
Plain Diff
Merge pull request #12710 from ZDroid/customize-multistr
Fix multistr errors in customizer.js
parents
e879127e
fe2222e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
docs/assets/js/customizer.js
+17
-19
docs/assets/js/customizer.js
with
17 additions
and
19 deletions
+17
-19
docs/assets/js/customizer.js
+
17
-
19
View file @
d8cfcad7
...
@@ -6,8 +6,6 @@
...
@@ -6,8 +6,6 @@
* details, see http://creativecommons.org/licenses/by/3.0/.
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
*/
/* jshint multistr: true */
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
'
+
var
cw
=
'
/*!
\n
'
+
'
* Bootstrap v3.1.0 (http://getbootstrap.com)
\n
'
+
'
* Bootstrap v3.1.0 (http://getbootstrap.com)
\n
'
+
...
@@ -16,21 +14,21 @@ window.onload = function () { // wait for load in a dumb way because B-0
...
@@ -16,21 +14,21 @@ window.onload = function () { // wait for load in a dumb way because B-0
'
*/
\n\n
'
'
*/
\n\n
'
function
showError
(
msg
,
err
)
{
function
showError
(
msg
,
err
)
{
$
(
'
<div id="bsCustomizerAlert" class="bs-customizer-alert">
\
$
(
'
<div id="bsCustomizerAlert" class="bs-customizer-alert">
'
+
<div class="container">
\
'
<div class="container">
'
+
<a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right">×</a>
\
'
<a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right">×</a>
'
+
<p class="bs-customizer-alert-text"><span class="glyphicon glyphicon-warning-sign"></span>
'
+
msg
+
'
</p>
'
+
'
<p class="bs-customizer-alert-text"><span class="glyphicon glyphicon-warning-sign"></span>
'
+
msg
+
'
</p>
'
+
(
err
.
extract
?
'
<pre class="bs-customizer-alert-extract">
'
+
err
.
extract
.
join
(
'
\n
'
)
+
'
</pre>
'
:
''
)
+
'
\
(
err
.
extract
?
'
<pre class="bs-customizer-alert-extract">
'
+
err
.
extract
.
join
(
'
\n
'
)
+
'
</pre>
'
:
''
)
+
</div>
\
'
</div>
'
+
</div>
'
).
appendTo
(
'
body
'
).
alert
()
'
</div>
'
).
appendTo
(
'
body
'
).
alert
()
throw
err
throw
err
}
}
function
showCallout
(
msg
,
showUpTop
)
{
function
showCallout
(
msg
,
showUpTop
)
{
var
callout
=
$
(
'
<div class="bs-callout bs-callout-danger">
\
var
callout
=
$
(
'
<div class="bs-callout bs-callout-danger">
'
+
<h4>Attention!</h4>
\
'
<h4>Attention!</h4>
'
+
<p>
'
+
msg
+
'
</p>
\
'
<p>
'
+
msg
+
'
</p>
'
+
</div>
'
)
'
</div>
'
)
if
(
showUpTop
)
{
if
(
showUpTop
)
{
callout
.
appendTo
(
'
.bs-docs-container
'
)
callout
.
appendTo
(
'
.bs-docs-container
'
)
...
@@ -333,15 +331,15 @@ window.onload = function () { // wait for load in a dumb way because B-0
...
@@ -333,15 +331,15 @@ window.onload = function () { // wait for load in a dumb way because B-0
// browser support alerts
// browser support alerts
if
(
!
window
.
URL
&&
navigator
.
userAgent
.
toLowerCase
().
indexOf
(
'
safari
'
)
!=
-
1
)
{
if
(
!
window
.
URL
&&
navigator
.
userAgent
.
toLowerCase
().
indexOf
(
'
safari
'
)
!=
-
1
)
{
showCallout
(
'
Looks like you
\'
re using safari, which sadly doesn
\'
t have the best support
\
showCallout
(
'
Looks like you
\'
re using safari, which sadly doesn
\'
t have the best support
'
+
for HTML5 blobs. Because of this your file will be downloaded with the name <code>"untitled"</code>.
\
'
for HTML5 blobs. Because of this your file will be downloaded with the name <code>"untitled"</code>.
'
+
However, if you check your downloads folder, just rename this <code>"untitled"</code> file
\
'
However, if you check your downloads folder, just rename this <code>"untitled"</code> file
'
+
to <code>"bootstrap.zip"</code> and you should be good to go!
'
)
'
to <code>"bootstrap.zip"</code> and you should be good to go!
'
)
}
else
if
(
!
window
.
URL
&&
!
window
.
webkitURL
)
{
}
else
if
(
!
window
.
URL
&&
!
window
.
webkitURL
)
{
$
(
'
.bs-docs-section, .bs-docs-sidebar
'
).
css
(
'
display
'
,
'
none
'
)
$
(
'
.bs-docs-section, .bs-docs-sidebar
'
).
css
(
'
display
'
,
'
none
'
)
showCallout
(
'
Looks like your current browser doesn
\'
t support the Bootstrap Customizer. Please take a second
\
showCallout
(
'
Looks like your current browser doesn
\'
t support the Bootstrap Customizer. Please take a second
'
+
to <a href="https://www.google.com/intl/en/chrome/browser/">
upgrade to a more modern browser</a>.
'
,
true
)
'
to <a href="https://www.google.com/intl/en/chrome/browser/">upgrade to a more modern browser</a>.
'
,
true
)
}
}
parseUrl
()
parseUrl
()
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment