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

Merge pull request #6707 from NativeScript/release

Browse Source
This commit is contained in:
Svetoslav
2018-12-14 16:40:11 +02:00
committed by GitHub
parent 07c4e5fa96 ea44416734
commit 134b033b77
85 changed files with 16109 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tns-core-modules/application/application.ios.ts
View File

@@ -305,7 +305,7 @@ export function start(entry?: string | NavigationEntry) {
started = true;
if (!iosApp.nativeApp) {
// Normal NativeScript app will need UIApplicationMain.
// Normal NativeScript app will need UIApplicationMain.
UIApplicationMain(0, null, null, iosApp && iosApp.delegate ? NSStringFromClass(<any>iosApp.delegate) : NSStringFromClass(Responder));
} else {
// TODO: this rootView should be held alive until rootController dismissViewController is called.
@@ -320,7 +320,7 @@ export function start(entry?: string | NavigationEntry) {
rootView._setupAsRootView({});
let embedderDelegate = NativeScriptEmbedder.sharedInstance().delegate;
if (embedderDelegate) {
embedderDelegate.performSelectorWithObject("presentNativeScriptApp:", controller);
embedderDelegate.presentNativeScriptApp(controller);
} else {
let visibleVC = utils.ios.getVisibleViewController(rootController);
visibleVC.presentViewControllerAnimatedCompletion(controller, true, null);