From 8ac6d3bf08c7cf615c43f78701153aefb6319f48 Mon Sep 17 00:00:00 2001
From: Andy Joslin <andytjoslin@gmail.com>
Date: Thu, 10 Apr 2014 07:42:06 -0600
Subject: [PATCH] fix($ionicPopup): stop race condition with show then hide

Addresses #1100.
---
 js/ext/angular/src/service/ionicPopup.js       | 11 ++++++-----
 js/ext/angular/test/service/ionicPopup.unit.js | 13 +++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/js/ext/angular/src/service/ionicPopup.js b/js/ext/angular/src/service/ionicPopup.js
index 68375980c99..1f3821e8c2e 100644
--- a/js/ext/angular/src/service/ionicPopup.js
+++ b/js/ext/angular/src/service/ionicPopup.js
@@ -1,6 +1,6 @@
 
 var TPL_POPUP =
-  '<div class="popup">' +
+  '<div class="popup popup-hidden">' +
     '<div class="popup-head">' +
       '<h3 class="popup-title" ng-bind-html="title"></h3>' +
       '<h5 class="popup-sub-title" ng-bind-html="subTitle" ng-if="subTitle"></h5>' +
@@ -320,7 +320,11 @@ function($animate, $ionicTemplateLoader, $ionicBackdrop, $log, $q, $timeout, $ro
       self.show = function() {
         if (self.isShown) return;
 
+        self.isShown = true;
         ionic.requestAnimationFrame(function() {
+          //if hidden while waiting for raf, don't show
+          if (!self.isShown) return;
+
           self.element.removeClass('popup-hidden');
           self.element.addClass('popup-showing active');
           focusLastButton(self.element);
@@ -332,18 +336,15 @@ function($animate, $ionicTemplateLoader, $ionicBackdrop, $log, $q, $timeout, $ro
             ionic.DomUtil.centerElementByMargin(self.element[0]);
           });
         });
-
-        self.isShown = true;
       };
       self.hide = function(callback) {
         callback = callback || angular.noop;
         if (!self.isShown) return callback();
 
+        self.isShown = false;
         self.element.removeClass('active');
         self.element.addClass('popup-hidden');
         $timeout(callback, 250);
-
-        self.isShown = false;
       };
       self.remove = function() {
         if (self.removed) return;
diff --git a/js/ext/angular/test/service/ionicPopup.unit.js b/js/ext/angular/test/service/ionicPopup.unit.js
index 558facc3cc9..e104433fe3c 100644
--- a/js/ext/angular/test/service/ionicPopup.unit.js
+++ b/js/ext/angular/test/service/ionicPopup.unit.js
@@ -95,6 +95,19 @@ describe('$ionicPopup service', function() {
         popup.show();
         expect(popup.isShown).toBe(true);
       });
+      it('should not show if isShown=false during raf wait', function() {
+        var popup = TestUtil.unwrapPromise($ionicPopup._createPopup());
+        var rafCallback;
+        ionic.requestAnimationFrame = function(cb) { rafCallback = cb; };
+        expect(popup.isShown).toBeFalsy();
+        popup.show();
+        expect(popup.isShown).toBe(true);
+        popup.isShown = false;
+        rafCallback();
+        expect(popup.element.hasClass('popup-showing')).toBe(false);
+        expect(popup.element.hasClass('active')).toBe(false);
+        ionic.requestAnimationFrame = function(cb) { cb(); };
+      });
     });
 
     describe('hide', function() {