Removing the swapping of scrollEnabled on and off, replacing it with directionLockEnabled

mergesort · mergesort · commit eafaa6a950d5 · 2013-12-18T16:16:36.000-05:00
diff --git a/SWTableViewCell/PodFiles/SWTableViewCell.m b/SWTableViewCell/PodFiles/SWTableViewCell.m
@@ -137,6 +137,8 @@ - (void)initializer
     {
         [self.scrollViewContentView addSubview:subview];
     }
+    
+    self.containingTableView.directionalLockEnabled = YES;
 }
 
 - (void)layoutSubviews
@@ -152,7 +154,6 @@ - (void)layoutSubviews
     self.scrollViewButtonViewRight.layer.masksToBounds = YES;
     self.scrollViewContentView.frame = CGRectMake([self leftUtilityButtonsWidth], 0, CGRectGetWidth(self.bounds), self.height);
     self.cellScrollView.scrollEnabled = YES;
-    self.containingTableView.scrollEnabled = YES;
     self.tapGestureRecognizer.enabled = YES;
 }
 
@@ -531,7 +532,6 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
-    self.containingTableView.scrollEnabled = NO;
     self.tapGestureRecognizer.enabled = NO;
     if (scrollView.contentOffset.x > [self leftUtilityButtonsWidth])
     {
@@ -562,7 +562,6 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 {
     self.tapGestureRecognizer.enabled = YES;
-    self.containingTableView.scrollEnabled = YES;
 }
 
 - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView
@@ -571,7 +570,6 @@ - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView
     self.tapGestureRecognizer.enabled = YES;
     if (_cellState == kCellStateCenter)
     {
-        self.containingTableView.scrollEnabled = YES;
         self.longPressGestureRecognizer.enabled = YES;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,8 @@ - (void)initializer`
`137`	`137`	`{`
`138`	`138`	`[self.scrollViewContentView addSubview:subview];`
`139`	`139`	`}`
	`140`	`+`
	`141`	`+ self.containingTableView.directionalLockEnabled = YES;`
`140`	`142`	`}`
`141`	`143`
`142`	`144`	`- (void)layoutSubviews`
`@@ -152,7 +154,6 @@ - (void)layoutSubviews`
`152`	`154`	`self.scrollViewButtonViewRight.layer.masksToBounds = YES;`
`153`	`155`	`self.scrollViewContentView.frame = CGRectMake([self leftUtilityButtonsWidth], 0, CGRectGetWidth(self.bounds), self.height);`
`154`	`156`	`self.cellScrollView.scrollEnabled = YES;`
`155`		`- self.containingTableView.scrollEnabled = YES;`
`156`	`157`	`self.tapGestureRecognizer.enabled = YES;`
`157`	`158`	`}`
`158`	`159`
`@@ -531,7 +532,6 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi`
`531`	`532`
`532`	`533`	`- (void)scrollViewDidScroll:(UIScrollView *)scrollView`
`533`	`534`	`{`
`534`		`- self.containingTableView.scrollEnabled = NO;`
`535`	`535`	`self.tapGestureRecognizer.enabled = NO;`
`536`	`536`	`if (scrollView.contentOffset.x > [self leftUtilityButtonsWidth])`
`537`	`537`	`{`
`@@ -562,7 +562,6 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView`
`562`	`562`	`- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView`
`563`	`563`	`{`
`564`	`564`	`self.tapGestureRecognizer.enabled = YES;`
`565`		`- self.containingTableView.scrollEnabled = YES;`
`566`	`565`	`}`
`567`	`566`
`568`	`567`	`- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView`
`@@ -571,7 +570,6 @@ - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView`
`571`	`570`	`self.tapGestureRecognizer.enabled = YES;`
`572`	`571`	`if (_cellState == kCellStateCenter)`
`573`	`572`	`{`
`574`		`- self.containingTableView.scrollEnabled = YES;`
`575`	`573`	`self.longPressGestureRecognizer.enabled = YES;`
`576`	`574`	`}`
`577`	`575`	`}`