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

Merge pull request #7269 from NativeScript/myankov/merge-release-master

Browse Source 
chore: merge release to master
This commit is contained in:
Martin Yankov
2019-05-22 09:31:30 +03:00
committed by GitHub
parent e7c575e96e bb58408f49
commit 4a8c397f3b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tns-core-modules/ui/core/view/view-common.ts
View File

@ -350,11 +350,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
} }
} }
if (isAndroid || (parent.viewController && parent.viewController.presentedViewController)) {
that._hideNativeModalView(parent, whenClosedCallback); that._hideNativeModalView(parent, whenClosedCallback);
} else {
whenClosedCallback();
}
} }
}; };
} }

6
tns-core-modules/ui/core/view/view.ios.ts
View File

@ -452,6 +452,12 @@ export class View extends ViewCommon {
return; return;
} }
// modal view has already been closed by UI, probably as a popover
if (!parent.viewController.presentedViewController) {
whenClosedCallback();
return;
}
const parentController = parent.viewController; const parentController = parent.viewController;
const animated = (<any>this.viewController).animated; const animated = (<any>this.viewController).animated;