fix(clickBlock): cancel pending show if already hidden

ionic-team · Dec 3, 2014 · 0967849 · 0967849
1 parent 6b4963e
commit 0967849
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/js/angular/service/clickBlock.js b/js/angular/service/clickBlock.js
@@ -6,29 +6,32 @@ IonicModule
 function($document, $ionicBody, $timeout) {
   var fallbackTimer, isAttached;
   var CSS_HIDE = 'click-block-hide';
+  var pendingShow;
 
   var cb = $document[0].createElement('div');
   cb.className = 'click-block';
 
   return {
     show: function(autoExpire) {
+      pendingShow = true;
       // cancel the fallback timer
       $timeout.cancel(fallbackTimer);
 
       ionic.requestAnimationFrame(function() {
-        if (isAttached) {
-          cb.classList.remove(CSS_HIDE);
-        } else {
-          $ionicBody.append(cb);
-          isAttached = true;
+        if (pendingShow) {
+          if (isAttached) {
+            cb.classList.remove(CSS_HIDE);
+          } else {
+            $ionicBody.append(cb);
+            isAttached = true;
+          }
         }
       });
 
-      fallbackTimer = $timeout(function() {
-        cb.classList.add(CSS_HIDE);
-      }, autoExpire || 300);
+      fallbackTimer = $timeout(this.hide, autoExpire || 310);
     },
     hide: function() {
+      pendingShow = false;
       $timeout.cancel(fallbackTimer);
       cb.classList.add(CSS_HIDE);
     }