Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents cdeefc7 + 8e91330 commit 05370cf710a55e1f5912febcc5464c327361b4dc @Inferis Inferis committed May 17, 2013
Showing with 7 additions and 10 deletions.
  1. +1 −1 README.md
  2. +1 −1 VERSION
  3. +2 −2 ViewDeck.podspec
  4. +3 −6 ViewDeck/IIViewDeckController.m
View
@@ -186,7 +186,7 @@ I'd appreciate it to mention the use of this code somewhere if you use it in an
**IIViewDeckController** published under the MIT license:
-*Copyright (C) 2011, Tom Adriaenssen*
+*Copyright (C) 2011-2013, Tom Adriaenssen*
*Permission is hereby granted, free of charge, to any person obtaining a copy of*
*this software and associated documentation files (the "Software"), to deal in*
View
@@ -1 +1 @@
-2.3.0
+2.3.1
View
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ViewDeck'
- s.version = '2.3'
+ s.version = '2.3.1'
s.platform = :ios
s.summary = 'An implementation of the sliding functionality found in the ' \
'Path 2.0 or Facebook iOS apps.'
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
}
s.author = { 'Tom Adriaenssen' => 'http://inferis.org/' }
s.source = { :git => 'https://github.com/Inferis/ViewDeck.git',
- :tag => '2.3'}
+ :tag => '2.3.1'}
s.source_files = 'ViewDeck/*.{h,m}'
s.frameworks = 'QuartzCore'
s.requires_arc = true
@@ -2300,15 +2300,12 @@ - (BOOL)gestureRecognizerShouldBegin:(UIPanGestureRecognizer *)panner {
UINavigationController* navController = [self.centerController isKindOfClass:[UINavigationController class]] ? (UINavigationController*)self.centerController : self.centerController.navigationController;
if (self.panningMode == IIViewDeckNavigationBarOrOpenCenterPanning && panner.view == self.slidingControllerView) {
- if (![self isAnySideOpen])
- return NO;
-
CGPoint loc = [panner locationInView:navController.navigationBar];
- if (!CGRectContainsPoint(navController.navigationBar.bounds, loc)) {
+
+ if (!CGRectContainsPoint(navController.navigationBar.bounds, loc) && ![self isAnySideOpen])
return NO;
- }
}
-
+
if (self.panningGestureDelegate && [self.panningGestureDelegate respondsToSelector:@selector(gestureRecognizerShouldBegin:)]) {
BOOL result = [self.panningGestureDelegate gestureRecognizerShouldBegin:panner];
if (!result) return result;

0 comments on commit 05370cf

Please sign in to comment.