Merge pull request #3624 from mstepanov/timob-5354-30x

(3_0_X)[TIMOB-5354] iOS: fix animations running concurrently with keyboard animation
tidev · Dec 28, 2012 · 725919a · 725919a
2 parents 5654371 + f8e2dab
commit 725919a
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/iphone/Classes/TiAnimation.m b/iphone/Classes/TiAnimation.m
@@ -398,15 +398,8 @@ -(void)animate:(id)args
 	animatedView = [theview retain];
 
     if (!transitionAnimation) {
-        UIViewAnimationOptions options = (UIViewAnimationOptionAllowUserInteraction); // Backwards compatible
-        if ([view_ animating]) {
-            //TIMOB-10318
-            //Start from current state if animations are already running. Otherwise from initial value.
-            options = options | UIViewAnimationOptionBeginFromCurrentState;
-        }
-        else {
-            [view_ animationStarted];
-        }
+        UIViewAnimationOptions options = (UIViewAnimationOptionAllowUserInteraction | UIViewAnimationOptionBeginFromCurrentState); // Backwards compatible
+		[view_ animationStarted];
         NSTimeInterval animationDuration = [self animationDuration];
 
         options |= [curve intValue];