mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 12:59:05 +02:00
Code Issues Releases Wiki Activity

Merge pull request #14061 from hnrch02/fix-13656

Browse Source 
Expose transition durations on plugin constructors; closes #13656
This commit is contained in:
Jacob
2014-08-01 12:50:03 -07:00
parent 948a74662f 231744d628
commit 8bf48121a0
6 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/tooltip.js
View File

@@ -27,6 +27,8 @@
Tooltip.VERSION = '3.2.0'
Tooltip.TRANSITION_DURATION = 150
Tooltip.DEFAULTS = {
animation: true,
placement: 'top',
@@ -207,7 +209,7 @@
$.support.transition && this.$tip.hasClass('fade') ?
$tip
.one('bsTransitionEnd', complete)
.emulateTransitionEnd(150) :
.emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
complete()
}
}
@@ -295,7 +297,7 @@
$.support.transition && this.$tip.hasClass('fade') ?
$tip
.one('bsTransitionEnd', complete)
.emulateTransitionEnd(150) :
.emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
complete()
this.hoverState = null