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

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

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-04-15 00:06:35 -07:00
parent a4c2332eb1 c262ead6ed
commit 6c221d65e3
7 changed files with 87 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

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

@@ -94,16 +94,15 @@
this.activeTarget = target
this.$body
.find(this.selector).parent('.active')
$(this.selector)
.parent('.active')
.removeClass('active')
active = this.$body
.find(this.selector + '[href="' + target + '"]')
active = $(this.selector + '[href="' + target + '"]')
.parent('li')
.addClass('active')
if ( active.parent('.dropdown-menu') ) {
if (active.parent('.dropdown-menu')) {
active = active.closest('li.dropdown').addClass('active')
}

36
docs/assets/js/bootstrap-tooltip.js vendored
View File

@@ -72,33 +72,25 @@
, enter: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (!self.options.delay || !self.options.delay.show) {
self.show()
} else {
clearTimeout(this.timeout)
self.hoverState = 'in'
this.timeout = setTimeout(function() {
if (self.hoverState == 'in') {
self.show()
}
}, self.options.delay.show)
}
if (!self.options.delay || !self.options.delay.show) return self.show()
clearTimeout(this.timeout)
self.hoverState = 'in'
this.timeout = setTimeout(function() {
if (self.hoverState == 'in') self.show()
}, self.options.delay.show)
}
, leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (!self.options.delay || !self.options.delay.hide) {
self.hide()
} else {
clearTimeout(this.timeout)
self.hoverState = 'out'
this.timeout = setTimeout(function() {
if (self.hoverState == 'out') {
self.hide()
}
}, self.options.delay.hide)
}
if (!self.options.delay || !self.options.delay.hide) return self.hide()
clearTimeout(this.timeout)
self.hoverState = 'out'
this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide()
}, self.options.delay.hide)
}
, show: function () {