From 8a6bf1ab6fc65fa8a5f614c73946c1bdd5d8e516 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Wed, 3 Dec 2014 01:52:27 -0600 Subject: [PATCH] refactor(clickBlock): reduce auto expire --- js/angular/service/clickBlock.js | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/js/angular/service/clickBlock.js b/js/angular/service/clickBlock.js index eac05811f7..182de8b2b0 100644 --- a/js/angular/service/clickBlock.js +++ b/js/angular/service/clickBlock.js @@ -11,12 +11,12 @@ function($document, $ionicBody, $timeout) { cb.className = 'click-block'; return { - show: function() { + show: function(autoExpire) { // cancel the fallback timer - $timeout.cancel( fallbackTimer ); + $timeout.cancel(fallbackTimer); - ionic.requestAnimationFrame(function(){ - if(isAttached) { + ionic.requestAnimationFrame(function() { + if (isAttached) { cb.classList.remove(CSS_HIDE); } else { $ionicBody.append(cb); @@ -24,18 +24,13 @@ function($document, $ionicBody, $timeout) { } }); - fallbackTimer = $timeout(function(){ + fallbackTimer = $timeout(function() { cb.classList.add(CSS_HIDE); - }, 750); + }, autoExpire || 300); }, hide: function() { - // cancel the fallback timer - $timeout.cancel( fallbackTimer ); - - // should be a minimum time it should hide - ionic.requestAnimationFrame(function(){ - cb.classList.add(CSS_HIDE); - }); + $timeout.cancel(fallbackTimer); + cb.classList.add(CSS_HIDE); } }; }]);