Merge pull request #211 from mutualmobile/bugfix_30

Mergin' Fix for the black side drawer like a bawss

Author: larsacus

MMDrawerController/MMDrawerController.m

@@ -461,6 +461,8 @@ -(void)setCenterViewController:(UIViewController *)newCenterViewController withF
 
         CGRect newCenterRect = self.centerContainerView.frame;
 
+        [self setAnimatingDrawer:animated];
+        
         UIViewController * oldCenterViewController = self.centerViewController;
         [oldCenterViewController beginAppearanceTransition:NO animated:animated];
         newCenterRect.origin.x = targetClosePoint;
@@ -498,7 +500,7 @@ -(void)setCenterViewController:(UIViewController *)newCenterViewController withF
                  [sideDrawerViewController.view setFrame:sideDrawerViewController.mm_visibleDrawerFrame];
 
                  [self setOpenSide:MMDrawerSideNone];
-                 
+                 [self setAnimatingDrawer:NO];
                  if(completion){
                      completion(finished);
                  }
@@ -914,7 +916,8 @@ -(UIColor*)statusBarViewBackgroundColor{
 #pragma mark - Gesture Handlers
 
 -(void)tapGestureCallback:(UITapGestureRecognizer *)tapGesture{
-    if(self.openSide != MMDrawerSideNone){
+    if(self.openSide != MMDrawerSideNone &&
+       self.isAnimatingDrawer == NO){
         [self closeDrawerAnimated:YES completion:^(BOOL finished) {
             if(self.gestureCompletion){
                 self.gestureCompletion(self, tapGesture);
@@ -925,8 +928,15 @@ -(void)tapGestureCallback:(UITapGestureRecognizer *)tapGesture{
 
 -(void)panGestureCallback:(UIPanGestureRecognizer *)panGesture{
     switch (panGesture.state) {
-        case UIGestureRecognizerStateBegan:
-            self.startingPanRect = self.centerContainerView.frame;
+        case UIGestureRecognizerStateBegan:{
+            if(self.animatingDrawer){
+                [panGesture setEnabled:NO];
+                break;
+            }
+            else {
+                self.startingPanRect = self.centerContainerView.frame;
+            }
+        }
         case UIGestureRecognizerStateChanged:{
             CGRect newFrame = self.startingPanRect;
             CGPoint translatedPoint = [panGesture translationInView:self.centerContainerView];
@@ -966,7 +976,6 @@ -(void)panGestureCallback:(UIPanGestureRecognizer *)panGesture{
             [self.centerContainerView setCenter:CGPointMake(CGRectGetMidX(newFrame), CGRectGetMidY(newFrame))];
             break;
         }
-        case UIGestureRecognizerStateCancelled:
         case UIGestureRecognizerStateEnded:{
             self.startingPanRect = CGRectNull;
             CGPoint velocity = [panGesture velocityInView:self.childControllerContainerView];
@@ -977,6 +986,10 @@ -(void)panGestureCallback:(UIPanGestureRecognizer *)panGesture{
             }];
             break;
         }
+        case UIGestureRecognizerStateCancelled:{
+            [panGesture setEnabled:YES];
+            break;
+        }
         default:
             break;
     }