Skip to content

Commit 4006122

Browse files
authored
fix(modal): fade inner dimmer
On multiple modals, when you close the second mdal, the dimmer of first modal did not fade out nicely
1 parent e35f5d7 commit 4006122

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/definitions/modules/modal.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@
620620
ignoreRepeatedEvents = false;
621621
if (settings.allowMultiple) {
622622
if (module.others.active()) {
623-
$otherModals.filter('.' + className.active).find(selector.dimmer).addClass('active');
623+
$otherModals.filter('.' + className.active).find(selector.dimmer).removeClass('out').addClass('transition fade in active');
624624
}
625625

626626
if (settings.detachable) {
@@ -692,6 +692,8 @@
692692
onStart: function () {
693693
if (!module.others.active() && !module.others.animating() && !keepDimmed) {
694694
module.hideDimmer();
695+
} else if (settings.allowMultiple) {
696+
(hideOthersToo ? $allModals : $previousModal).find(selector.dimmer).removeClass('in').addClass('out');
695697
}
696698
if (settings.keyboardShortcuts && !module.others.active()) {
697699
module.remove.keyboardShortcuts();
@@ -704,11 +706,7 @@
704706
$previousModal.addClass(className.front);
705707
$module.removeClass(className.front);
706708

707-
if (hideOthersToo) {
708-
$allModals.find(selector.dimmer).removeClass('active');
709-
} else {
710-
$previousModal.find(selector.dimmer).removeClass('active');
711-
}
709+
(hideOthersToo ? $allModals : $previousModal).find(selector.dimmer).removeClass('active');
712710
}
713711
if (isFunction(settings.onHidden)) {
714712
settings.onHidden.call(element);

0 commit comments

Comments
 (0)