diff options
| author | Jacob Thornton <[email protected]> | 2012-10-17 21:38:01 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-10-17 21:38:01 -0700 |
| commit | 8e6697f2b20da705377d2a7a2eb6957a4df59d77 (patch) | |
| tree | a74876b2006677d83418b8e967145f2249455d7b /docs/assets/js/bootstrap.js | |
| parent | ac6625de5fb01067e6f64996c84e93ade654d7d5 (diff) | |
| parent | 0a3e034891255f31f37adb69c2f01fd5f6d259d1 (diff) | |
| download | bootstrap-8e6697f2b20da705377d2a7a2eb6957a4df59d77.tar.xz bootstrap-8e6697f2b20da705377d2a7a2eb6957a4df59d77.zip | |
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index d1672330c..e96798039 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -794,13 +794,12 @@ that.$element .addClass('in') .attr('aria-hidden', false) - .focus() that.enforceFocus() transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') + that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) : + that.$element.focus().trigger('shown') }) } @@ -956,7 +955,8 @@ }) }) -}(window.jQuery);/* =========================================================== +}(window.jQuery); +/* =========================================================== * bootstrap-tooltip.js v2.1.2 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame |