diff options
| author | Jacob Thornton <[email protected]> | 2013-07-24 20:10:16 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-07-24 20:10:16 -0700 |
| commit | eaefed517a960893204cade3525bda100454e13f (patch) | |
| tree | 6227f06e1e88cd0321975a43a9b9cc9dbd9e5138 /dist/js/bootstrap.js | |
| parent | 930c75e5dd0f2ae861a505bda740f289570c9b8a (diff) | |
| download | bootstrap-eaefed517a960893204cade3525bda100454e13f.tar.xz bootstrap-eaefed517a960893204cade3525bda100454e13f.zip | |
fixes #8399 w/ tests
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 20cbe66a4..dbcb9a0c7 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -390,7 +390,7 @@ $next[0].offsetWidth // force reflow $active.addClass(direction) $next.addClass(direction) - this.$element.find('.item') + $active .one($.support.transition.end, function () { $next.removeClass([type, direction].join(' ')).addClass('active') $active.removeClass(['active', direction].join(' ')) @@ -1138,10 +1138,10 @@ var self = obj instanceof this.constructor ? obj : $(obj.currentTarget)[this.type](options).data('bs.' + this.type) - if (!self.options.delay || !self.options.delay.show) return self.show() - clearTimeout(self.timeout) + if (!self.options.delay || !self.options.delay.show) return self.show() + self.hoverState = 'in' self.timeout = setTimeout(function () { if (self.hoverState == 'in') self.show() |