mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-22 13:13:03 +02:00
Code Issues Releases Wiki Activity

fixes #7163

Browse Source
This commit is contained in:
fat
2013-05-27 12:45:13 -07:00
parent 7cbb1c0452
commit 9257bdc097
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/assets/js/bootstrap.js vendored
View File

@@ -448,6 +448,13 @@
e.preventDefault() e.preventDefault()
}) })
$(window).on('load', function () {
$('[data-ride="carousel"]').each(function () {
var $carousel = $(this)
$carousel.carousel($carousel.data())
})
})
}(window.jQuery); }(window.jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: collapse.js v3.0.0 * Bootstrap: collapse.js v3.0.0
@@ -1317,7 +1324,7 @@
Tooltip.prototype.toggle = function (e) { Tooltip.prototype.toggle = function (e) {
var self = e ? $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) : this var self = e ? $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) : this
self.tip().hasClass('in') ? self.hide() : self.show() self.tip().hasClass('in') ? self.leave(e) : self.enter(e)
} }
Tooltip.prototype.destroy = function () { Tooltip.prototype.destroy = function () {

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
js/tooltip.js
View File

@@ -91,7 +91,7 @@
return options return options
} }
Tooltip.prototype.enter = function (e) { Tooltip.prototype.enter = function (obj) {
var defaults = this.getDefaults() var defaults = this.getDefaults()
var options = {} var options = {}
@@ -99,7 +99,8 @@
if (defaults[key] != value) options[key] = value if (defaults[key] != value) options[key] = value
}) })
var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type) 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() if (!self.options.delay || !self.options.delay.show) return self.show()
@@ -111,10 +112,12 @@
}, self.options.delay.show) }, self.options.delay.show)
} }
Tooltip.prototype.leave = function (e) { Tooltip.prototype.leave = function (obj) {
var self = $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) var self = obj instanceof this.constructor ?
obj : $(obj.currentTarget)[this.type](this._options).data('bs.' + this.type)
clearTimeout(this.timeout)
if (this.timeout) clearTimeout(this.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'
@@ -315,7 +318,7 @@
Tooltip.prototype.toggle = function (e) { Tooltip.prototype.toggle = function (e) {
var self = e ? $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) : this var self = e ? $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) : this
self.tip().hasClass('in') ? self.hide() : self.show() self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
} }
Tooltip.prototype.destroy = function () { Tooltip.prototype.destroy = function () {