rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
Mark Otto 2013-07-23 23:48:32 -07:00
commit 8540515eeb
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/js/bootstrap.js vendored
View File

@ -1140,10 +1140,10 @@
if (!self.options.delay || !self.options.delay.show) return self.show()
clearTimeout(this.timeout)
clearTimeout(self.timeout)
self.hoverState = 'in'
this.timeout = setTimeout(function () {
self.timeout = setTimeout(function () {
if (self.hoverState == 'in') self.show()
}, self.options.delay.show)
}
@ -1152,12 +1152,12 @@
var self = obj instanceof this.constructor ?
obj : $(obj.currentTarget)[this.type](this._options).data('bs.' + this.type)
clearTimeout(this.timeout)
clearTimeout(self.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
self.hoverState = 'out'
this.timeout = setTimeout(function () {
self.timeout = setTimeout(function () {
if (self.hoverState == 'out') self.hide()
}, self.options.delay.hide)
}

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
js/tooltip.js
View File

@ -104,10 +104,10 @@
if (!self.options.delay || !self.options.delay.show) return self.show()
clearTimeout(this.timeout)
clearTimeout(self.timeout)
self.hoverState = 'in'
this.timeout = setTimeout(function () {
self.timeout = setTimeout(function () {
if (self.hoverState == 'in') self.show()
}, self.options.delay.show)
}
@ -116,12 +116,12 @@
var self = obj instanceof this.constructor ?
obj : $(obj.currentTarget)[this.type](this._options).data('bs.' + this.type)
clearTimeout(this.timeout)
clearTimeout(self.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
self.hoverState = 'out'
this.timeout = setTimeout(function () {
self.timeout = setTimeout(function () {
if (self.hoverState == 'out') self.hide()
}, self.options.delay.hide)
}