2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

make generic fade animation css class

This commit is contained in:
Jacob Thornton
2011-08-27 18:03:01 -07:00
parent 2ee7c20692
commit e05d39d4cc
7 changed files with 36 additions and 37 deletions
+2 -2
View File
@@ -51,11 +51,11 @@
that.$element = null
}
$.support.transition ?
$.support.transition && this.$element.hasClass('fade') ?
this.$element.bind(transitionEnd, removeElement) :
removeElement()
this.$element.removeClass('show')
this.$element.removeClass('in')
}
}
+11 -8
View File
@@ -55,17 +55,19 @@
var that = this
this.isOpen = true
this.$element = $(this.settings.content)
_.escape.call(this)
_.backdrop.call(this)
this.$element = $(this.settings.content)
this.$element
.delegate('.close', 'click', function (e) { e.preventDefault(); that.close() })
.appendTo(document.body)
.show()
setTimeout(function () {
that.$element.addClass('show')
that.$backdrop && that.$backdrop.addClass('show')
that.$element.addClass('in')
that.$backdrop && that.$backdrop.addClass('in')
}, 1)
return this
@@ -79,14 +81,14 @@
_.escape.call(this)
_.backdrop.call(this)
this.$element.removeClass('show')
this.$element.removeClass('in')
function removeElement () {
that.$element.remove()
that.$element = null
}
$.support.transition ?
$.support.transition && this.$element.hasClass('fade') ?
this.$element.bind(transitionEnd, removeElement) :
removeElement()
@@ -103,19 +105,20 @@
backdrop: function () {
var that = this
, animate = this.$element.hasClass('fade') ? 'fade' : ''
if ( this.isOpen && this.settings.backdrop ) {
this.$backdrop = $('<div class="modal-backdrop" />')
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.click(function () { that.close() })
.appendTo(document.body)
} else if ( !this.isOpen && this.$backdrop ) {
this.$backdrop.removeClass('show')
this.$backdrop.removeClass('in')
function removeElement() {
that.$backdrop.remove()
that.$backdrop = null
}
$.support.transition ?
$.support.transition && this.$element.hasClass('fade')?
this.$backdrop.bind(transitionEnd, removeElement) :
removeElement()
}
+10 -4
View File
@@ -54,6 +54,11 @@
if (this.getTitle() && this.enabled) {
$tip = this.tip()
this.setContent()
if (this.options.animate) {
$tip.addClass('fade')
}
$tip
.remove()
.css({ top: 0, left: 0, display: 'block' })
@@ -86,7 +91,7 @@
$tip
.css(tp)
.addClass(placement)
.addClass('show')
.addClass('in')
}
}
@@ -100,13 +105,13 @@
var that = this
, $tip = this.tip()
$tip.removeClass('show')
$tip.removeClass('in')
function removeElement () {
$tip.remove()
}
$.support.transition ?
$.support.transition && this.$tip.hasClass('fade') ?
$tip.bind(transitionEnd, removeElement) :
removeElement()
}
@@ -264,7 +269,8 @@
$.fn.twipsy.Twipsy = Twipsy
$.fn.twipsy.defaults = {
delayIn: 0
animate: true
, delayIn: 0
, delayOut: 0
, fallback: ''
, placement: 'above'