Merge pull request #37 from zipme/develop

Update scrollViewDefaultInsets

Author: serejahh

PullToRefresh/PullToRefresh.swift

@@ -26,7 +26,7 @@ public class PullToRefresh: NSObject {
     let refreshView: UIView
     var action: (() -> ())?
 
-    var observes = false
+    private var isObserving = false
 
     private let animator: RefreshViewAnimator
 
@@ -91,6 +91,7 @@ public class PullToRefresh: NSObject {
 
     private var KVOContext = "PullToRefreshKVOContext"
     private let contentOffsetKeyPath = "contentOffset"
+    private let contentInsetKeyPath = "contentInset"
     private let contentSizeKeyPath = "contentSize"
     private var previousScrollViewOffset: CGPoint = CGPointZero
 
@@ -127,6 +128,11 @@ public class PullToRefresh: NSObject {
             if case .Bottom = position {
                 refreshView.frame = CGRect(x: 0, y: scrollView!.contentSize.height, width: scrollView!.bounds.width, height: refreshView.bounds.height)
             }
+        } else if (context == &KVOContext && keyPath == contentInsetKeyPath && object as? UIScrollView == scrollView) {
+            if self.state == .Initial {
+                scrollViewDefaultInsets = scrollView!.contentInset
+            }
+          
         } else {
             super.observeValueForKeyPath(keyPath, ofObject: object, change: change, context: context)
         }
@@ -135,21 +141,27 @@ public class PullToRefresh: NSObject {
     }
 
     private func addScrollViewObserving() {
-        guard let scrollView = scrollView where !observes else {
+        guard let scrollView = scrollView where !isObserving else {
             return
         }
 
         scrollView.addObserver(self, forKeyPath: contentOffsetKeyPath, options: .Initial, context: &KVOContext)
         scrollView.addObserver(self, forKeyPath: contentSizeKeyPath, options: .Initial, context: &KVOContext)
+        scrollView.addObserver(self, forKeyPath: contentInsetKeyPath, options: .New, context: &KVOContext)
+      
+        isObserving = true
     }
 
     private func removeScrollViewObserving() {
-        guard let scrollView = scrollView where observes else {
+        guard let scrollView = scrollView where isObserving else {
             return
         }
 
         scrollView.removeObserver(self, forKeyPath: contentOffsetKeyPath, context: &KVOContext)
         scrollView.removeObserver(self, forKeyPath: contentSizeKeyPath, context: &KVOContext)
+        scrollView.removeObserver(self, forKeyPath: contentInsetKeyPath, context: &KVOContext)
+      
+        isObserving = false
     }
 }