diff options
| author | Jacob Thornton <[email protected]> | 2012-02-18 23:31:37 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-18 23:31:37 -0800 |
| commit | ac6e667ad9ae57c5caa977fd6593a2299887737a (patch) | |
| tree | d6616980eb7de863c2a9083f6646ba8a4f102272 /docs | |
| parent | 1948e985a355c519b8f3940af0ce83d9fd3c5f83 (diff) | |
| parent | 3d58b4622671bc51c22c857641db3b988e73632a (diff) | |
| download | bootstrap-ac6e667ad9ae57c5caa977fd6593a2299887737a.tar.xz bootstrap-ac6e667ad9ae57c5caa977fd6593a2299887737a.zip | |
Merge branch 'master' into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53361 -> 53408 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-button.js | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex b10d1d3c6..df4dc7ff2 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip 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') }) }) |