From 8787760aad446aac633616a02886af6e370ac0e2 Mon Sep 17 00:00:00 2001
From: Perry Govier <govierp@gmail.com>
Date: Thu, 25 Sep 2014 15:47:26 -0500
Subject: [PATCH] fix(pull to refresh): minor optimization to prevent flicker
 on deactivate

---
 js/angular/controller/scrollController.js | 7 +------
 js/views/scrollView.js                    | 3 +++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/js/angular/controller/scrollController.js b/js/angular/controller/scrollController.js
index 565f2c9458..5f2c9e5940 100644
--- a/js/angular/controller/scrollController.js
+++ b/js/angular/controller/scrollController.js
@@ -221,12 +221,7 @@ function($scope, scrollViewOptions, $timeout, $window, $$scrollValueCache, $loca
       refresherScope.$onPulling();
     }, function() {
       // deactivateCallback
-      $timeout(function(){
-        refresher.classList.remove('active');
-        refresher.classList.remove('refreshing');
-        refresher.classList.remove('refreshing-tail');
-        refresher.classList.add('invisible');
-      },300);
+        refresher.classList.remove('active', 'refreshing', 'refreshing-tail');
     }, function() {
       // startCallback
       refresher.classList.add('refreshing');
diff --git a/js/views/scrollView.js b/js/views/scrollView.js
index eb59c0f3cb..f7008e319b 100644
--- a/js/views/scrollView.js
+++ b/js/views/scrollView.js
@@ -1342,6 +1342,9 @@ ionic.views.Scroll = ionic.views.View.inherit({
         if (self.__refreshDeactivate) {
           self.__refreshDeactivate();
         }
+        if(self.__refreshHide){
+          self.__refreshHide();
+        }
 
         self.scrollTo(self.__scrollLeft, self.__scrollTop, true);
       },self.__refreshTailTime);