diff options
| author | billy gates <[email protected]> | 2012-10-17 21:21:31 -0700 |
|---|---|---|
| committer | billy gates <[email protected]> | 2012-10-17 21:21:31 -0700 |
| commit | 3074737d90f1f8f77e0dde3473f4bbe870a217b8 (patch) | |
| tree | 8661d074737def25e8194d19ad99e6a4d2bc6a78 /docs/assets/js/bootstrap.js | |
| parent | e0a007b9299e6991c78bcb77384e15979d6b7485 (diff) | |
| parent | e24b46b7f3fb9eab5f34fb6e199d24781204c745 (diff) | |
| download | bootstrap-3074737d90f1f8f77e0dde3473f4bbe870a217b8.tar.xz bootstrap-3074737d90f1f8f77e0dde3473f4bbe870a217b8.zip | |
Merge pull request #5549 from mfansler/2.1.2-wip
fixes #5336: reorder focus() call to avoid scrolling
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 |