Skip to content

B
bootstrap
Commit 8540515e authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

parents 18157e9f 3cfa1c8a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
dist/js/bootstrap.js
View file @ 8540515e
...@@ -1140,10 +1140,10 @@ ...@@ -1140,10 +1140,10 @@
if (!self.options.delay || !self.options.delay.show) return self.show() if (!self.options.delay || !self.options.delay.show) return self.show()
clearTimeout(this.timeout) clearTimeout(self.timeout)
self.hoverState = 'in' self.hoverState = 'in'
this.timeout = setTimeout(function () { self.timeout = setTimeout(function () {
if (self.hoverState == 'in') self.show() if (self.hoverState == 'in') self.show()
}, self.options.delay.show) }, self.options.delay.show)
} }
...@@ -1152,12 +1152,12 @@ ...@@ -1152,12 +1152,12 @@
var self = obj instanceof this.constructor ? var self = obj instanceof this.constructor ?
obj : $(obj.currentTarget)[this.type](this._options).data('bs.' + this.type) 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() if (!self.options.delay || !self.options.delay.hide) return self.hide()
self.hoverState = 'out' self.hoverState = 'out'
this.timeout = setTimeout(function () { self.timeout = setTimeout(function () {
if (self.hoverState == 'out') self.hide() if (self.hoverState == 'out') self.hide()
}, self.options.delay.hide) }, self.options.delay.hide)
} }
......
dist/js/bootstrap.min.js
View file @ 8540515e
This diff is collapsed.
js/tooltip.js
View file @ 8540515e
...@@ -104,10 +104,10 @@ ...@@ -104,10 +104,10 @@
if (!self.options.delay || !self.options.delay.show) return self.show() if (!self.options.delay || !self.options.delay.show) return self.show()
clearTimeout(this.timeout) clearTimeout(self.timeout)
self.hoverState = 'in' self.hoverState = 'in'
this.timeout = setTimeout(function () { self.timeout = setTimeout(function () {
if (self.hoverState == 'in') self.show() if (self.hoverState == 'in') self.show()
}, self.options.delay.show) }, self.options.delay.show)
} }
...@@ -116,12 +116,12 @@ ...@@ -116,12 +116,12 @@
var self = obj instanceof this.constructor ? var self = obj instanceof this.constructor ?
obj : $(obj.currentTarget)[this.type](this._options).data('bs.' + this.type) 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() if (!self.options.delay || !self.options.delay.hide) return self.hide()
self.hoverState = 'out' self.hoverState = 'out'
this.timeout = setTimeout(function () { self.timeout = setTimeout(function () {
if (self.hoverState == 'out') self.hide() if (self.hoverState == 'out') self.hide()
}, self.options.delay.hide) }, self.options.delay.hide)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment