Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

issue #240 - firefox drop css transition events :{o

  • Loading branch information...
commit 8f726dc6ef3ee725ef032ef4a11dbce26982ae24 1 parent 169b4b5
F A T fat authored
Showing with 16 additions and 3 deletions.
  1. +16 −3 js/bootstrap-modal.js
19 js/bootstrap-modal.js
View
@@ -89,8 +89,7 @@
that.$element[0].offsetWidth // force reflow
}
- that.$element
- .addClass('in')
+ that.$element.addClass('in')
transition ?
that.$element.one(transitionEnd, function () { that.$element.trigger('shown') }) :
@@ -118,7 +117,7 @@
.removeClass('in')
$.support.transition && this.$element.hasClass('fade') ?
- this.$element.one(transitionEnd, $.proxy(hideModal, this)) :
+ hideWithTransition.call(this) :
hideModal.call(this)
return this
@@ -130,6 +129,20 @@
/* MODAL PRIVATE METHODS
* ===================== */
+ function hideWithTransition() {
+ // firefox drops transitionEnd events :{o
+ var that = this
+ , timeout = setTimeout(function () {
+ that.$element.unbind(transitionEnd)
+ hideModal.call(that)
+ }, 500)
+
+ this.$element.one(transitionEnd, function () {
+ clearTimeout(timeout)
+ hideModal.call(that)
+ })
+ }
+
function hideModal (that) {
this.$element
.hide()
Please sign in to comment.
Something went wrong with that request. Please try again.