Permalink
Browse files

Merge branch 'master' of https://github.com/samsoffes/SYPaginator int…

…o samsoffes-master

Conflicts:
	SYPaginator/SYPaginatorViewController.m
  • Loading branch information...
dorshorst committed Sep 14, 2012
2 parents 912d541 + 55d0d0f commit bfe63d08be7ef14ab5c7563692f379744938febc
Showing with 14 additions and 0 deletions.
  1. +8 −0 SYPaginator/SYPaginatorView.m
  2. +6 −0 SYPaginator/SYPaginatorViewController.m
@@ -139,6 +139,14 @@ - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event {
}
+- (void)willMoveToSuperview:(UIView *)newSuperview {
+ [super willMoveToSuperview:newSuperview];
+ if (!newSuperview) {
+ [self _cleanup];
+ }
+}
+
+
#pragma mark - Managing data
- (void)reloadData {
@@ -51,6 +51,12 @@ - (void)viewDidLoad {
}
+- (void)viewDidUnload {
+ [super viewDidUnload];
+ [_paginator removeFromSuperview];
+}
+
+
#pragma mark - Private
- (void)_initialize {

0 comments on commit bfe63d0

Please sign in to comment.