Skip to content
This repository has been archived by the owner on Nov 8, 2017. It is now read-only.

Infinite scroll fix #84

Merged
merged 5 commits into from
Aug 16, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Make currentPage property visible
  • Loading branch information
msaps committed Aug 16, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 913ad7bc8e908ab59602a55e19a78348098bd848
Original file line number Diff line number Diff line change
@@ -14,10 +14,6 @@
The default page index of the page view controller.
*/
@property (nonatomic, assign, readonly) NSInteger defaultPageIndex;
/**
The current active page index of the page view controller.
*/
@property (nonatomic, assign) NSInteger currentPage;
/**
Whether user interaction is currently enabled on the page view controller
*/
Original file line number Diff line number Diff line change
@@ -122,6 +122,10 @@ willDisplayInitialViewController:(nonnull UIViewController *)viewController;
The number of pages in the page view controller.
*/
@property (nonatomic, assign ,readonly) NSInteger numberOfPages;
/**
The current active page index of the page view controller.
*/
@property (nonatomic, assign, readonly) NSInteger currentPage;
/**
The view controllers within the page view controller.
*/
Original file line number Diff line number Diff line change
@@ -218,7 +218,7 @@ - (void)setUpPages {
[self setUpViewControllers:self.viewControllers];

_numberOfPages = self.viewControllers.count;
self.currentPage = self.defaultPageIndex;
_currentPage = self.defaultPageIndex;

if ([self.delegate respondsToSelector:@selector(pageViewController:didPrepareViewControllers:)]) {
[self.delegate pageViewController:self didPrepareViewControllers:self.viewControllers];