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

Merge pull request #2384 from NativeScript/issue-2173

Browse Source 
Fix: iOS onSuspend + showModal() returning "Error: This value is not …
This commit is contained in:
Rossen Hristov
2016-06-30 09:32:24 +03:00
committed by GitHub
parent bc1224e351 8dc732cfbe
commit e61affc0c0
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tns-core-modules/ui/page/page.ios.ts
View File

@ -372,11 +372,20 @@ export class Page extends pageCommon.Page {
this._ios.modalPresentationStyle = UIModalPresentationStyle.UIModalPresentationFormSheet; this._ios.modalPresentationStyle = UIModalPresentationStyle.UIModalPresentationFormSheet;
this._UIModalPresentationFormSheet = true; this._UIModalPresentationFormSheet = true;
} }
super._raiseShowingModallyEvent(); super._raiseShowingModallyEvent();
parent.ios.presentViewControllerAnimatedCompletion(this._ios, utils.ios.MajorVersion >= 7, null); parent.ios.presentViewControllerAnimatedCompletion(this._ios, utils.ios.MajorVersion >= 7, null);
UIViewControllerTransitionCoordinator.prototype.animateAlongsideTransitionCompletion.call(parent.ios.transitionCoordinator(), null, () => this._raiseShownModallyEvent()); let transitionCoordinator = parent.ios.transitionCoordinator();
if (transitionCoordinator){
UIViewControllerTransitionCoordinator.prototype.animateAlongsideTransitionCompletion.call(transitionCoordinator, null, () => this._raiseShownModallyEvent());
}
else {
// Apparently iOS 9+ stops all transitions and animations upon application suspend and transitionCoordinator becomes null here in this case.
// Since we are not waiting for any transition to complete, i.e. transitionCoordinator is null, we can directly raise our shownModally event.
// Take a look at https://github.com/NativeScript/NativeScript/issues/2173 for more info and a sample project.
this._raiseShownModallyEvent();
}
} }
protected _hideNativeModalView(parent: Page) { protected _hideNativeModalView(parent: Page) {