mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-23 00:39:54 +00:00
Code Issues Projects Releases Wiki Activity

Expose transition durations on plugin constructors; closes #13656

Browse Source
This commit is contained in:
Heinrich Fenkart 2014-07-07 13:03:56 +02:00
parent a0d8d56593
commit 231744d628
6 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/alert.js
View File

@ -20,6 +20,8 @@
Alert.VERSION = '3.2.0' Alert.VERSION = '3.2.0'
Alert.TRANSITION_DURATION = 150
Alert.prototype.close = function (e) { Alert.prototype.close = function (e) {
var $this = $(this) var $this = $(this)
var selector = $this.attr('data-target') var selector = $this.attr('data-target')
@ -51,7 +53,7 @@
$.support.transition && $parent.hasClass('fade') ? $.support.transition && $parent.hasClass('fade') ?
$parent $parent
.one('bsTransitionEnd', removeElement) .one('bsTransitionEnd', removeElement)
.emulateTransitionEnd(150) : .emulateTransitionEnd(Alert.TRANSITION_DURATION) :
removeElement() removeElement()
} }

4
js/carousel.js
View File

@ -30,6 +30,8 @@
Carousel.VERSION = '3.2.0' Carousel.VERSION = '3.2.0'
Carousel.TRANSITION_DURATION = 600
Carousel.DEFAULTS = { Carousel.DEFAULTS = {
interval: 5000, interval: 5000,
pause: 'hover', pause: 'hover',
@ -146,7 +148,7 @@
that.$element.trigger(slidEvent) that.$element.trigger(slidEvent)
}, 0) }, 0)
}) })
.emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000) .emulateTransitionEnd(Carousel.TRANSITION_DURATION)
} else { } else {
$active.removeClass('active') $active.removeClass('active')
$next.addClass('active') $next.addClass('active')

6
js/collapse.js
View File

@ -24,6 +24,8 @@
Collapse.VERSION = '3.2.0' Collapse.VERSION = '3.2.0'
Collapse.TRANSITION_DURATION = 350
Collapse.DEFAULTS = { Collapse.DEFAULTS = {
toggle: true toggle: true
} }
@ -72,7 +74,7 @@
this.$element this.$element
.one('bsTransitionEnd', $.proxy(complete, this)) .one('bsTransitionEnd', $.proxy(complete, this))
.emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize]) .emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize])
} }
Collapse.prototype.hide = function () { Collapse.prototype.hide = function () {
@ -105,7 +107,7 @@
this.$element this.$element
[dimension](0) [dimension](0)
.one('bsTransitionEnd', $.proxy(complete, this)) .one('bsTransitionEnd', $.proxy(complete, this))
.emulateTransitionEnd(350) .emulateTransitionEnd(Collapse.TRANSITION_DURATION)
} }
Collapse.prototype.toggle = function () { Collapse.prototype.toggle = function () {

11
js/modal.js
View File

@ -32,6 +32,9 @@
Modal.VERSION = '3.2.0' Modal.VERSION = '3.2.0'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
Modal.DEFAULTS = { Modal.DEFAULTS = {
backdrop: true, backdrop: true,
keyboard: true, keyboard: true,
@ -88,7 +91,7 @@
.one('bsTransitionEnd', function () { .one('bsTransitionEnd', function () {
that.$element.trigger('focus').trigger(e) that.$element.trigger('focus').trigger(e)
}) })
.emulateTransitionEnd(300) : .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
that.$element.trigger('focus').trigger(e) that.$element.trigger('focus').trigger(e)
}) })
} }
@ -119,7 +122,7 @@
$.support.transition && this.$element.hasClass('fade') ? $.support.transition && this.$element.hasClass('fade') ?
this.$element this.$element
.one('bsTransitionEnd', $.proxy(this.hideModal, this)) .one('bsTransitionEnd', $.proxy(this.hideModal, this))
.emulateTransitionEnd(300) : .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
this.hideModal() this.hideModal()
} }
@ -182,7 +185,7 @@
doAnimate ? doAnimate ?
this.$backdrop this.$backdrop
.one('bsTransitionEnd', callback) .one('bsTransitionEnd', callback)
.emulateTransitionEnd(150) : .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
callback() callback()
} else if (!this.isShown && this.$backdrop) { } else if (!this.isShown && this.$backdrop) {
@ -195,7 +198,7 @@
$.support.transition && this.$element.hasClass('fade') ? $.support.transition && this.$element.hasClass('fade') ?
this.$backdrop this.$backdrop
.one('bsTransitionEnd', callbackRemove) .one('bsTransitionEnd', callbackRemove)
.emulateTransitionEnd(150) : .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
callbackRemove() callbackRemove()
} else if (callback) { } else if (callback) {

4
js/tab.js
View File

@ -19,6 +19,8 @@
Tab.VERSION = '3.2.0' Tab.VERSION = '3.2.0'
Tab.TRANSITION_DURATION = 150
Tab.prototype.show = function () { Tab.prototype.show = function () {
var $this = this.element var $this = this.element
var $ul = $this.closest('ul:not(.dropdown-menu)') var $ul = $this.closest('ul:not(.dropdown-menu)')
@ -82,7 +84,7 @@
$active.length && transition ? $active.length && transition ?
$active $active
.one('bsTransitionEnd', next) .one('bsTransitionEnd', next)
.emulateTransitionEnd(150) : .emulateTransitionEnd(Tab.TRANSITION_DURATION) :
next() next()
$active.removeClass('in') $active.removeClass('in')

6
js/tooltip.js
View File

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