Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
f347d7d9
Commit
f347d7d9
authored
10 years ago
by
Chris Rebert
Browse files
Options
Download
Email Patches
Plain Diff
address
#13811
parent
5cfd6b51
5 merge requests
!28721
Hot test
,
!16605
Test pull please ignore
,
!22103
test
,
!13842
update "is jQuery defined" check for UMD compatibility
,
!25326
Adjust examples
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Gruntfile.js
+1
-1
Gruntfile.js
dist/js/bootstrap.js
+1
-1
dist/js/bootstrap.js
docs/assets/js/_src/customizer.js
+1
-1
docs/assets/js/_src/customizer.js
with
3 additions
and
3 deletions
+3
-3
Gruntfile.js
+
1
-
1
View file @
f347d7d9
...
...
@@ -33,7 +33,7 @@ module.exports = function (grunt) {
'
* Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)
\n
'
+
'
*/
\n
'
,
// NOTE: This jqueryCheck code is duplicated in customizer.js; if making changes here, be sure to update the other copy too.
jqueryCheck
:
'
if (typeof jQuery ==
=
\'
undefined
\'
) { throw new Error(
\'
Bootstrap
\\\'
s JavaScript requires jQuery
\'
) }
\n\n
'
,
jqueryCheck
:
'
if (typeof
define ==
\'
undefined
\'
&& typeof exports ==
\'
undefined
\'
&& typeof
jQuery ==
\'
undefined
\'
) { throw new Error(
\'
Bootstrap
\\\'
s JavaScript requires jQuery
\'
) }
\n\n
'
,
// Task configuration.
clean
:
{
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.js
+
1
-
1
View file @
f347d7d9
...
...
@@ -4,7 +4,7 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
if
(
typeof
jQuery
==
=
'
undefined
'
)
{
throw
new
Error
(
'
Bootstrap
\'
s JavaScript requires jQuery
'
)
}
if
(
typeof
define
==
'
undefined
'
&&
typeof
exports
==
'
undefined
'
&&
typeof
jQuery
==
'
undefined
'
)
{
throw
new
Error
(
'
Bootstrap
\'
s JavaScript requires jQuery
'
)
}
/* ========================================================================
* Bootstrap: transition.js v3.1.1
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/_src/customizer.js
+
1
-
1
View file @
f347d7d9
...
...
@@ -306,7 +306,7 @@ 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
'
var
jqueryCheck
=
'
if (typeof
define ==
\'
undefined
\'
&& typeof exports ==
\'
undefined
\'
&& typeof
jQuery ==
\'
undefined
\'
) { throw new Error(
\'
Bootstrap
\
\\
'
s JavaScript requires jQuery
\'
) }
\n\n
'
if
(
!
$checked
.
length
)
return
false
...
...
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
Menu
Explore
Projects
Groups
Snippets