From ab9f81efba824b27f71872298f98e78e155f2a92 Mon Sep 17 00:00:00 2001
From: Merkulov Ilya <im@redmadrobot.com>
Date: Mon, 18 Apr 2016 13:47:49 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BC=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Classes/RMRPullToRefresh.swift                |  4 ++--
 Classes/RMRPullToRefreshController.swift      | 18 ++++--------------
 Example/RMRPullToRefresh/ViewController.swift |  4 ++++
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Classes/RMRPullToRefresh.swift b/Classes/RMRPullToRefresh.swift
index d5bb569..ecdde85 100644
--- a/Classes/RMRPullToRefresh.swift
+++ b/Classes/RMRPullToRefresh.swift
@@ -45,8 +45,8 @@ public class RMRPullToRefresh: NSObject {
         сontroller?.configureView(view, state: state, result: result)
     }
     
-    public func configureView(view :RMRPullToRefreshView) {
-        сontroller?.configureView(view, result: .Success)
+    public func configureView(view :RMRPullToRefreshView, result:RMRPullToRefreshResultType) {
+        сontroller?.configureView(view, result: result)
     }
     
     public func setupDefaultSettings() {
diff --git a/Classes/RMRPullToRefreshController.swift b/Classes/RMRPullToRefreshController.swift
index 76bf9aa..eedc101 100644
--- a/Classes/RMRPullToRefreshController.swift
+++ b/Classes/RMRPullToRefreshController.swift
@@ -208,7 +208,9 @@ public class RMRPullToRefreshController: NSObject {
     }
     
     @objc private func stopAllAnimations() {
-        stopped = true
+        if shouldHideWhenStopLoading() {
+            stopped = true
+        }
         containerView.stopAllAnimations(shouldHideWhenStopLoading())
     }
     
@@ -224,7 +226,7 @@ public class RMRPullToRefreshController: NSObject {
     private func scrollViewDidChangePanState(scrollView: UIScrollView, panState: UIGestureRecognizerState) {
         if panState == .Ended || panState == .Cancelled || panState == .Failed {
             
-            if state == .Loading || !stopped {
+            if state == .Loading || (shouldHideWhenStopLoading() && !stopped) {
                 return
             }
             
@@ -248,18 +250,6 @@ public class RMRPullToRefreshController: NSObject {
             } else {
                 state = .Stopped
                 updateContainerView(state)
-                if !shouldHideWhenStopLoading() {
-                    var inset = scrollView.contentInset
-                    if position == .Top && inset.top != originalTopInset {
-                        inset.top = originalTopInset
-                        setContentInset(inset, animated: true)
-                        self.performSelector(#selector(forceStopAllAnimations), withObject: nil, afterDelay: 0.2)
-                    } else if position == .Bottom && inset.top != originalBottomInset {
-                        inset.bottom = originalBottomInset
-                        setContentInset(inset, animated: true)
-                        self.performSelector(#selector(forceStopAllAnimations), withObject: nil, afterDelay: 0.2)
-                    }
-                }
             }
         }
     }
diff --git a/Example/RMRPullToRefresh/ViewController.swift b/Example/RMRPullToRefresh/ViewController.swift
index d504910..8f98ca5 100644
--- a/Example/RMRPullToRefresh/ViewController.swift
+++ b/Example/RMRPullToRefresh/ViewController.swift
@@ -64,6 +64,10 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
         } else if exampleType == .RedmadrobotTop || exampleType == .RedmadrobotBottom {
             redmadrobot()
         }
+        
+        pullToRefresh?.setHideDelay(5.0, result: .Success)
+        
+        pullToRefresh?.hideWhenError = false
     }
     
     // MARK: - Build example values