diff options
| author | Mark Otto <[email protected]> | 2012-12-21 18:59:14 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-21 18:59:14 -0800 |
| commit | d23006a6bd76959db3c1ef2de6451e8905e77046 (patch) | |
| tree | 3852800fb7608efd4a103d6fa83658e71e5a2368 /docs/assets/js/bootstrap.js | |
| parent | ccafc8a01023d66768b34b2597e50d6f7df4ca58 (diff) | |
| parent | 818c56f078ff3b14fefceca77608d1e95f33a783 (diff) | |
| download | bootstrap-d23006a6bd76959db3c1ef2de6451e8905e77046.tar.xz bootstrap-d23006a6bd76959db3c1ef2de6451e8905e77046.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index e6f4969ad..cf9346eda 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -369,6 +369,7 @@ e = $.Event('slide', { relatedTarget: $next[0] + , direction: direction }) if ($next.hasClass('active')) return @@ -2001,6 +2002,7 @@ e.stopPropagation() e.preventDefault() this.select() + this.$element.focus() } , mouseenter: function (e) { |