click block updates

ionic/components/content/content.js

@@ -19,5 +19,6 @@ import {
 export class Content {
   constructor() {
     this.contentClass = true;
+    console.log('Content!');
   }
 }

ionic/components/nav/nav-base.js

@@ -195,8 +195,6 @@ export class NavBase {
           // allow clicks again
           ClickBlock(false);
 
-          console.log('transition, canSwipeBack()', this.canSwipeBack());
-
           // resolve that this push has completed
           resolve();
         });

ionic/util/click-block.js

@@ -1,5 +1,8 @@
+import {raf} from './dom'
+
 
 const CSS_CLICK_BLOCK = 'click-block-active';
+const DEFAULT_EXPIRE = 330;
 let cbEle, fallbackTimerId, pendingShow;
 
 function preventClick(ev) {
@@ -8,8 +11,20 @@ function preventClick(ev) {
 }
 
 function show(expire) {
+  pendingShow = true;
   clearTimeout(fallbackTimerId);
-  fallbackTimerId = setTimeout(hide, expire || 320);
+  fallbackTimerId = setTimeout(hide, expire || DEFAULT_EXPIRE);
+  raf(addBlock);
+}
+
+function hide() {
+  pendingShow = false;
+  clearTimeout(fallbackTimerId);
+  raf(removeBlock);
+}
+
+function addBlock() {
+  if (pendingShow) {
 
     if (cbEle) {
       cbEle.classList.add(CSS_CLICK_BLOCK);
@@ -21,14 +36,16 @@ function show(expire) {
       cbEle.addEventListener('touchstart', preventClick);
       cbEle.addEventListener('mousedown', preventClick);
     }
+    pendingShow = false;
+  }
 }
 
-function hide() {
-  clearTimeout(fallbackTimerId);
+function removeBlock() {
+  if (!pendingShow) {
     cbEle && cbEle.classList.remove(CSS_CLICK_BLOCK);
+  }
 }
 
-
 export let ClickBlock = function(shouldShow, expire) {
 
   (shouldShow ? show : hide)(expire);