mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-06 21:56:42 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source 
Conflicts:
	docs-assets/js/raw-files.js
This commit is contained in:
Mark Otto
2013-12-24 12:17:48 -08:00
parent 679c786237 25390716ea
commit 5c2dfbf33b
27 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/tooltip.js
View File

@@ -177,6 +177,7 @@
var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
this.applyPlacement(calculatedOffset, placement)
this.hoverState = null
this.$element.trigger('shown.bs.' + this.type)
}
}
@@ -265,6 +266,7 @@
.emulateTransitionEnd(150) :
complete()
this.hoverState = null
this.$element.trigger('hidden.bs.' + this.type)
return this