1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 10:34:07 +02:00

fixes #8399 w/ tests

This commit is contained in:
Jacob Thornton
2013-07-24 20:10:16 -07:00
parent 930c75e5dd
commit eaefed517a
5 changed files with 52 additions and 7 deletions

View File

@@ -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()

File diff suppressed because one or more lines are too long