fix(popup): prevent back to back popups from dismissing background. F…

…ixes #2071
ionic-team · Sep 26, 2014 · 5658a4d · jbollacke · Nov 24, 2014 · 5658a4d
1 parent 10068e2
commit 5658a4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/js/angular/service/popup.js b/js/angular/service/popup.js
@@ -403,7 +403,9 @@ function($ionicTemplateLoader, $ionicBackdrop, $q, $timeout, $rootScope, $ionicB
             // click which would trigging whatever was underneath this
             $ionicBody.removeClass('popup-open');
           }, 400);
-          $ionicBackdrop.release();
+          $timeout(function(){
+            if(popupStack.length === 0)$ionicBackdrop.release();
+          }, config.stackPushDelay || 0);
           ($ionicPopup._backButtonActionDone || angular.noop)();
         }
         return result;

diff --git a/test/unit/angular/service/popup.unit.js b/test/unit/angular/service/popup.unit.js
@@ -265,9 +265,9 @@ describe('$ionicPopup service', function() {
       $ionicPopup.show();
       fakePopup.responseDeferred.resolve();
       $timeout.flush();
-      expect($ionicBackdrop.release).toHaveBeenCalled();
       expect(backDoneSpy).toHaveBeenCalled();
       $timeout.flush();
+      expect($ionicBackdrop.release).toHaveBeenCalled();
       expect(document.body.classList.contains('popup-open')).toBe(false);
     }));
     it('template should only overwrite prompt input if it includes html', inject(function($timeout) {