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
7a3f41b1
Commit
7a3f41b1
authored
11 years ago
by
Chris Rebert
Browse files
Options
Download
Email Patches
Plain Diff
<3 @asselin for figuring out this combo of 2 patches for
#9920
; re-grunt
parent
5d6e9212
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dist/js/bootstrap.js
+10
-4
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+1
-1
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
+2
-2
docs-assets/js/raw-files.js
with
13 additions
and
7 deletions
+13
-7
dist/js/bootstrap.js
+
10
-
4
View file @
7a3f41b1
...
...
@@ -220,15 +220,21 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
Button
.
prototype
.
toggle
=
function
()
{
var
$parent
=
this
.
$element
.
closest
(
'
[data-toggle="buttons"]
'
)
var
changed
=
true
if
(
$parent
.
length
)
{
var
$input
=
this
.
$element
.
find
(
'
input
'
)
.
prop
(
'
checked
'
,
!
this
.
$element
.
hasClass
(
'
active
'
))
.
trigger
(
'
change
'
)
if
(
$input
.
prop
(
'
type
'
)
===
'
radio
'
)
$parent
.
find
(
'
.active
'
).
removeClass
(
'
active
'
)
if
(
$input
.
prop
(
'
type
'
)
===
'
radio
'
)
{
// see if clicking on current one
if
(
$input
.
prop
(
'
checked
'
)
&&
this
.
$element
.
hasClass
(
'
active
'
))
changed
=
false
else
$parent
.
find
(
'
.active
'
).
removeClass
(
'
active
'
)
}
if
(
changed
)
$input
.
prop
(
'
checked
'
,
!
this
.
$element
.
hasClass
(
'
active
'
)).
trigger
(
'
change
'
)
}
this
.
$element
.
toggleClass
(
'
active
'
)
if
(
changed
)
this
.
$element
.
toggleClass
(
'
active
'
)
}
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.min.js
+
1
-
1
View file @
7a3f41b1
This diff is collapsed.
Click to expand it.
docs-assets/js/raw-files.js
+
2
-
2
View file @
7a3f41b1
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