javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1580 from NativeScript/issue-1576

Browse Source 
Slide transition broken when navigating back on iOS.
This commit is contained in:
Rossen Hristov
2016-02-18 18:37:06 +02:00
parent 5a96452cd0 c770abe4fe
commit a42a728251
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ui/transition/slide-transition.ios.ts
View File

@ -40,9 +40,8 @@ export class SlideTransition extends transition.Transition {
break; break;
} }
var originalToViewTransform = toView.transform;
toView.transform = toViewBeginTransform; toView.transform = toViewBeginTransform;
//fromView.transform = CGAffineTransformIdentity; fromView.transform = CGAffineTransformIdentity;
switch (operation) { switch (operation) {
case UINavigationControllerOperation.UINavigationControllerOperationPush: case UINavigationControllerOperation.UINavigationControllerOperationPush:
@ -57,7 +56,7 @@ export class SlideTransition extends transition.Transition {
var curve = this.getCurve(); var curve = this.getCurve();
UIView.animateWithDurationAnimationsCompletion(duration, () => { UIView.animateWithDurationAnimationsCompletion(duration, () => {
UIView.setAnimationCurve(curve); UIView.setAnimationCurve(curve);
toView.transform = originalToViewTransform; toView.transform = CGAffineTransformIdentity;
fromView.transform = fromViewEndTransform; fromView.transform = fromViewEndTransform;
}, completion); }, completion);
} }