Merge branch 'release/0.4.7'

uias · Feb 28, 2017 · a4040e6 · a4040e6
2 parents 44f065c + bcebfd3
commit a4040e6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Pageboy.podspec b/Pageboy.podspec
@@ -4,7 +4,7 @@ Pod::Spec.new do |s|
  s.platform = :ios, "9.0"
  s.requires_arc = true
 
- s.version = "0.4.6"
+ s.version = "0.4.7"
  s.summary = "A simple, highly informative page view controller."
  s.description = <<-DESC
  Pageboy is a page view controller that provides simplified data source management, enhanced delegation and other useful features.

diff --git a/Sources/Pageboy/Info.plist b/Sources/Pageboy/Info.plist
@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
- <string>0.4.6</string>
+ <string>0.4.7</string>
  <key>CFBundleVersion</key>
  <string>AUTO_GENERATED</string>
  <key>NSPrincipalClass</key>

diff --git a/Sources/Pageboy/PageboyScrollDetection.swift b/Sources/Pageboy/PageboyScrollDetection.swift
@@ -69,7 +69,7 @@ extension PageboyViewController: UIPageViewControllerDelegate, UIScrollViewDeleg
  contentOffset = scrollView.contentOffset.y
  }
 
- let scrollIndexDiff = CGFloat(abs((self.expectedTransitionIndex ?? currentIndex + 1) - currentIndex))
+ let scrollIndexDiff = CGFloat(max(1, abs((self.expectedTransitionIndex ?? currentIndex + 1) - currentIndex)))
  let scrollOffset = contentOffset - pageSize
  let pageOffset = (CGFloat(currentIndex) * pageSize) + (scrollOffset * scrollIndexDiff)
  var pagePosition = pageOffset / pageSize
@@ -96,7 +96,7 @@ extension PageboyViewController: UIPageViewControllerDelegate, UIScrollViewDeleg
  } else {
  positionPoint = CGPoint(x: scrollView.contentOffset.x, y: pagePosition)
  }
-
+  
  // ignore duplicate updates
  guard self.currentPosition != positionPoint else { return }
  self.currentPosition = positionPoint