Merge pull request #1 from stefz/master

Fixed bug when a transition is cancelled
m4tbat · Dec 15, 2014 · 034f1cc · 034f1cc
2 parents 321329c + bd20fbe
commit 034f1cc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/Pod/Classes/.gitkeep b/Pod/Classes/.gitkeep
diff --git a/Pod/Classes/Animators/MBTXYAnimator.m b/Pod/Classes/Animators/MBTXYAnimator.m
@@ -48,7 +48,7 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
                          toView.frame = finalToFrame;
                      }
                      completion:^(BOOL finished) {
-                         if (!finished) {
+                         if ([transitionContext transitionWasCancelled]) {
                              fromView.frame = initialFromFrame;
                              toView.frame = initialToFrame;
                          }

diff --git a/Pod/Classes/Animators/MBTZAnimator.m b/Pod/Classes/Animators/MBTZAnimator.m
@@ -44,14 +44,14 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
                         options:0
                      animations:^{
                          fromView.transform = CGAffineTransformMakeScale(scaleFromX, scaleFromY);
-                         fromView.alpha = 0;
+                         fromView.alpha = 0.0;
                          toView.transform = CGAffineTransformIdentity;
-                         toView.alpha = 1;
+                         toView.alpha = 1.0;
                      }
                      completion:^(BOOL finished) {
                          if (!finished) {
                              fromView.transform = CGAffineTransformIdentity;
-                             fromView.alpha = 1;
+                             fromView.alpha = 1.0;
                          }
 
                          [transitionContext completeTransition:![transitionContext transitionWasCancelled]];

diff --git a/Pod/Classes/MBT3DGridViewController.h b/Pod/Classes/MBT3DGridViewController.h
@@ -49,11 +49,6 @@ typedef NS_ENUM(NSInteger, MBT3DGridTransitionDirection) {
 
 @property (weak, nonatomic) IBOutlet UIView *backgroundView;
 
-/**
- *  <#Description#>
- *
- *  @param direction <#direction description#>
- */
 - (BOOL)moveAlongDirection:(MBT3DGridTransitionDirection)direction interactively:(BOOL)interactively;
 
 @end

diff --git a/Pod/Classes/MBT3DGridViewController.m b/Pod/Classes/MBT3DGridViewController.m
@@ -55,6 +55,7 @@ - (void)viewDidLoad {
     [self addChildViewController:self.currentContentViewController];
     [self.currentContentViewController beginAppearanceTransition:YES animated:NO];
     [self.view addSubview:self.currentContentViewController.view];
+
     [self.currentContentViewController didMoveToParentViewController:self];
     [self.currentContentViewController endAppearanceTransition];
 }