fix(modal): defer promise resolution until animation starts

- Defer resolution of modalInstance promise until the animation cycle starts
angular-ui · Jun 11, 2015 · b8cd02d · b8cd02d
1 parent 988336c
commit b8cd02d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/modal/modal.js b/src/modal/modal.js
@@ -324,7 +324,10 @@ angular.module('ui.bootstrap.modal', [])
       $modalStack.close = function (modalInstance, result) {
         var modalWindow = openedWindows.get(modalInstance);
         if (modalWindow && broadcastClosing(modalWindow, result, true)) {
-          modalWindow.value.deferred.resolve(result);
+          // Defer resolution until after modal window is closed - #3787
+          $timeout(function() {
+            modalWindow.value.deferred.resolve(result);
+          });
           removeModalWindow(modalInstance, modalWindow.value.modalOpener);
           return true;
         }
@@ -334,7 +337,10 @@ angular.module('ui.bootstrap.modal', [])
       $modalStack.dismiss = function (modalInstance, reason) {
         var modalWindow = openedWindows.get(modalInstance);
         if (modalWindow && broadcastClosing(modalWindow, reason, false)) {
-          modalWindow.value.deferred.reject(reason);
+          // Defer rejection until after modal window is dismissed - #3787
+          $timeout(function() {
+            modalWindow.value.deferred.reject(reason);
+          });
           removeModalWindow(modalInstance, modalWindow.value.modalOpener);
           return true;
         }