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

fix(modal): fix modal closed resolution #5326

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/modal/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap'])
openedClasses.remove(modalBodyClass, modalInstance);
appendToElement.toggleClass(modalBodyClass, openedClasses.hasKey(modalBodyClass));
toggleTopWindowClass(true);
});
}, modalWindow.closedDeferred);
checkRemoveBackdrop();

//move focus to specified element if available, or else to body
Expand Down
18 changes: 16 additions & 2 deletions src/modal/test/modal.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -480,16 +480,30 @@ describe('$uibModal', function() {

it('should resolve the closed promise when modal is closed', function() {
var modal = open({template: '<div>Content</div>'});
var closed = false;
close(modal, 'closed ok');

expect(modal.closed).toBeResolvedWith(undefined);
modal.closed.then(function() {
closed = true;
});

$rootScope.$digest();

expect(closed).toBe(true);
});

it('should resolve the closed promise when modal is dismissed', function() {
var modal = open({template: '<div>Content</div>'});
var closed = false;
dismiss(modal, 'esc');

expect(modal.closed).toBeResolvedWith(undefined);
modal.closed.then(function() {
closed = true;
});

$rootScope.$digest();

expect(closed).toBe(true);
});

it('should expose a promise linked to the templateUrl / resolve promises', function() {
Expand Down