Merge remote-tracking branch 'origin/pr/335' into develop

Conflicts: ViewDeck/IIViewDeckController.m
binhho · Apr 24, 2013 · 41c6d40 · 41c6d40
2 parents dd4c179 + 6b23a94
commit 41c6d40
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ViewDeck/IIViewDeckController.m b/ViewDeck/IIViewDeckController.m
@@ -1418,7 +1418,7 @@ - (BOOL)openSideView:(IIViewDeckSide)side animated:(BOOL)animated duration:(NSTi
 
     if (duration == DEFAULT_DURATION) duration = [self openSlideDuration:animated];
 
-    UIViewAnimationOptions options = UIViewAnimationOptionCurveEaseOut | UIViewAnimationOptionLayoutSubviews | UIViewAnimationOptionBeginFromCurrentState;
+    UIViewAnimationOptions options = UIViewAnimationOptionLayoutSubviews | UIViewAnimationOptionBeginFromCurrentState;
 
     IIViewDeckControllerBlock finish = ^(IIViewDeckController *controller, BOOL success) {
         if (!success) {
@@ -1446,6 +1446,8 @@ - (BOOL)openSideView:(IIViewDeckSide)side animated:(BOOL)animated duration:(NSTi
         return [self closeOpenViewAnimated:animated completion:finish];
     }
     else {
+        options |= UIViewAnimationOptionCurveEaseOut;
+
         finish(self, YES);
         return YES;
     }