fix(popup): make sure backdrop is always released

Closes #3524.
ionic-team · Apr 15, 2015 · 31de853 · 31de853 · MehulATL · Apr 20, 2015
1 parent 4a65807
commit 31de853
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/js/angular/service/popup.js b/js/angular/service/popup.js
@@ -376,6 +376,7 @@ function($ionicTemplateLoader, $ionicBackdrop, $q, $timeout, $rootScope, $ionicB
     } else {
       //Add popup-open & backdrop if this is first popup
       $ionicBody.addClass('popup-open');
+      console.log("RETAIN");
       $ionicBackdrop.retain();
       //only show the backdrop on the first popup
       $ionicPopup._backButtonActionDone = $ionicPlatform.registerBackButtonAction(
@@ -409,6 +410,7 @@ function($ionicTemplateLoader, $ionicBackdrop, $q, $timeout, $rootScope, $ionicB
             popupStack.splice(index, 1);
           }
           popup.remove();
+          $ionicBackdrop.release();
 
           if (popupStack.length > 0) {
             popupStack[popupStack.length - 1].show();
@@ -421,9 +423,6 @@ function($ionicTemplateLoader, $ionicBackdrop, $q, $timeout, $rootScope, $ionicB
                 $ionicBody.removeClass('popup-open');
               }
             }, 400, false);
-            $timeout(function() {
-              if (!popupStack.length) $ionicBackdrop.release();
-            }, config.stackPushDelay || 0, false);
 
             ($ionicPopup._backButtonActionDone || noop)();
           }