Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit c55ee4f

Browse files
wesleychoFoxandxss
authored andcommitted
fix(modal): animate backdrop concurrently with window
- Start animation of backdrop at the same time as the window Closes #4039 Closes #4036
1 parent 1afc5d1 commit c55ee4f

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/modal/modal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ angular.module('ui.bootstrap.modal', [])
230230

231231
removeAfterAnimate(modalWindow.modalDomEl, modalWindow.modalScope, function() {
232232
body.toggleClass(OPENED_MODAL_CLASS, openedWindows.length() > 0);
233-
checkRemoveBackdrop();
234233
});
234+
checkRemoveBackdrop();
235235

236236
//move focus to specified element if available, or else to body
237237
if (elementToReceiveFocus && elementToReceiveFocus.focus) {

src/modal/test/modal.spec.js

-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ describe('$modal', function () {
179179
expect($document).toHaveBackdrop();
180180

181181
dismiss(modal, 'closing in test');
182-
$animate.triggerCallbacks();
183182

184183
expect($document).toHaveModalsOpen(0);
185184

@@ -226,7 +225,6 @@ describe('$modal', function () {
226225
expect($document).toHaveBackdrop();
227226

228227
dismiss(modal, 'closing in test');
229-
$animate.triggerCallbacks();
230228

231229
expect($document).toHaveModalsOpen(0);
232230

0 commit comments

Comments
 (0)