From eb59a45992e16e48b4e3b93b6eb2634e28c1a8de Mon Sep 17 00:00:00 2001 From: Thurloat Date: Wed, 23 Jan 2013 13:45:10 -0400 Subject: [PATCH 1/2] if the transition is already complete (element is shown) then fire complete immediately. --- js/bootstrap-modalmanager.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/bootstrap-modalmanager.js b/js/bootstrap-modalmanager.js index e282450..eee09a7 100644 --- a/js/bootstrap-modalmanager.js +++ b/js/bootstrap-modalmanager.js @@ -93,9 +93,11 @@ modal.$element.triggerHandler('shown'); }; - transition ? - modal.$element.one($.support.transition.end, complete) : + if (transition && modal.$element.is('hidden')) { + modal.$element.one($.support.transition.end, complete); + } else { complete(); + } }); }; From d19a516d95ff4889dbd7ebef71aa1a67b554ab81 Mon Sep 17 00:00:00 2001 From: Thurloat Date: Wed, 23 Jan 2013 14:57:48 -0400 Subject: [PATCH 2/2] missing colon, my bad. --- js/bootstrap-modalmanager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/bootstrap-modalmanager.js b/js/bootstrap-modalmanager.js index eee09a7..ac42b41 100644 --- a/js/bootstrap-modalmanager.js +++ b/js/bootstrap-modalmanager.js @@ -93,7 +93,7 @@ modal.$element.triggerHandler('shown'); }; - if (transition && modal.$element.is('hidden')) { + if (transition && modal.$element.is(':hidden')) { modal.$element.one($.support.transition.end, complete); } else { complete();