From 3731fd5f5f3b5db51f5e996d81461bd2e664c2c6 Mon Sep 17 00:00:00 2001 From: Jordan Schroter Date: Wed, 11 Sep 2013 17:43:13 -0400 Subject: [PATCH] trigger a relayout due to firebox's buggy transition end --- js/bootstrap-modalmanager.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/bootstrap-modalmanager.js b/js/bootstrap-modalmanager.js index d35fa16..9abc5f2 100644 --- a/js/bootstrap-modalmanager.js +++ b/js/bootstrap-modalmanager.js @@ -79,7 +79,6 @@ modal.$element.appendTo(modal.$container); that.backdrop(modal, function () { - modal.$element.show(); if (transition) { @@ -113,8 +112,12 @@ modal.$element.on('hidden.modalmanager', targetIsSelf(function (e) { that.backdrop(modal); - if (modal.$backdrop){ + var transition = $.support.transition && modal.$element.hasClass('fade'); + + // trigger a relayout due to firebox's buggy transition end event + if (transition) { modal.$element[0].offsetWidth; } + $.support.transition && modal.$element.hasClass('fade') ? modal.$backdrop.one($.support.transition.end, function () { that.destroyModal(modal) }) : that.destroyModal(modal); @@ -131,7 +134,6 @@ }, destroyModal: function (modal) { - modal.destroy(); var hasOpenModal = this.hasOpenModal();