Merge branch 'master' of https://github.com/monsieurje/ICViewPager

iltercengiz · Mar 3, 2014 · 1fe2346 · 1fe2346
2 parents fac93e3 + 321a28d
commit 1fe2346
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 xcuserdata/
 project.xcworkspace/
 .idea/
diff --git a/ICViewPager.podspec b/ICViewPager.podspec
@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
   s.screenshots  = "https://dl.dropboxusercontent.com/u/17948706/Resources/SS.png"
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.author       = { "Ilter Cengiz" => "[email protected]" }
-  s.platform     = :ios, '6.1'
+  s.platform     = :ios, '6.0'
   s.source       = { :git => "https://github.com/monsieurje/ICViewPager.git", :tag => "1.5" }
   s.source_files = 'ICViewPager/ICViewPager/*.{h,m}'
   s.requires_arc = true

diff --git a/ICViewPager.xcodeproj/project.pbxproj b/ICViewPager.xcodeproj/project.pbxproj
@@ -300,7 +300,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ICViewPager/ICViewPager-Prefix.pch";
 				INFOPLIST_FILE = "ICViewPager/ICViewPager-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -314,7 +314,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ICViewPager/ICViewPager-Prefix.pch";
 				INFOPLIST_FILE = "ICViewPager/ICViewPager-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/ICViewPager/ICViewPager/ViewPagerController.m b/ICViewPager/ICViewPager/ViewPagerController.m
@@ -233,8 +233,11 @@ - (IBAction)handleTapGesture:(id)sender {
     UIView *tabView = tapGestureRecognizer.view;
     __block NSUInteger index = [self.tabs indexOfObject:tabView];
 
-    // Select the tab
-    [self selectTabAtIndex:index];
+    //if Tap is not selected Tab(new Tab)
+    if (self.activeTabIndex != index) {
+        // Select the tab
+        [self selectTabAtIndex:index];
+    }
 }
 
 #pragma mark - Interface rotation
@@ -372,7 +375,9 @@ - (void)setActiveContentIndex:(NSUInteger)activeContentIndex {
         [self.pageViewController setViewControllers:@[viewController]
                                           direction:UIPageViewControllerNavigationDirectionForward
                                            animated:NO
-                                         completion:nil];
+                                         completion:^(BOOL completed) {
+                                             weakSelf.animatingToTab = NO;
+                                         }];
 
     } else if (!(activeContentIndex + 1 == self.activeContentIndex || activeContentIndex - 1 == self.activeContentIndex)) {
 
@@ -397,7 +402,9 @@ - (void)setActiveContentIndex:(NSUInteger)activeContentIndex {
         [self.pageViewController setViewControllers:@[viewController]
                                           direction:(activeContentIndex < self.activeContentIndex) ? UIPageViewControllerNavigationDirectionReverse : UIPageViewControllerNavigationDirectionForward
                                            animated:YES
-                                         completion:nil];
+                                         completion:^(BOOL completed) {
+                                             weakSelf.animatingToTab = NO;
+                                         }];
     }
 
     // Clean out of sight contents
@@ -567,6 +574,11 @@ - (void)reloadData {
     [self defaultSetup];
 }
 - (void)selectTabAtIndex:(NSUInteger)index {
+
+    if (index >= self.tabCount) {
+        return;
+    }
+
     self.animatingToTab = YES;
 
     // Set activeTabIndex