aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-02-18 23:29:58 -0800
committerJacob Thornton <[email protected]>2012-02-18 23:29:58 -0800
commit3d58b4622671bc51c22c857641db3b988e73632a (patch)
treec2449b661858c5ab4846ad40f94648a1833033b6 /docs
parent7ec09d0db9b1117d708682a08efaa55045e6926e (diff)
downloadbootstrap-3d58b4622671bc51c22c857641db3b988e73632a.tar.xz
bootstrap-3d58b4622671bc51c22c857641db3b988e73632a.zip
fix bootstrap-button toggle regression + tests
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin53357 -> 53404 bytes
-rw-r--r--docs/assets/js/bootstrap-button.js4
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 4cad194d7..9add96d32 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js
index a0e053547..0238ca3cb 100644
--- a/docs/assets/js/bootstrap-button.js
+++ b/docs/assets/js/bootstrap-button.js
@@ -91,7 +91,9 @@
$(function () {
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
- $(e.currentTarget).button('toggle')
+ var $btn = $(e.target)
+ if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+ $btn.button('toggle')
})
})