From 761cd47360e9a8feba745fd999fa5a26add50b37 Mon Sep 17 00:00:00 2001 From: Manol Donev Date: Mon, 25 Mar 2019 16:04:48 +0200 Subject: [PATCH] chore: fix app.start deprecation (#7067) --- tns-core-modules/application/application.android.ts | 10 +++++++--- tns-core-modules/application/application.ios.ts | 11 +++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tns-core-modules/application/application.android.ts b/tns-core-modules/application/application.android.ts index 1d2f0c76b..14ff82693 100644 --- a/tns-core-modules/application/application.android.ts +++ b/tns-core-modules/application/application.android.ts @@ -131,9 +131,8 @@ let mainEntry: NavigationEntry; let started = false; // NOTE: for backwards compatibility. Remove for 4.0.0. const createRootFrame = { value: true }; -export function start(entry?: NavigationEntry | string) { - console.log("application.start() is deprecated; use application.run() instead"); +function _start(entry?: NavigationEntry | string) { if (started) { throw new Error("Application is already started."); } @@ -146,13 +145,18 @@ export function start(entry?: NavigationEntry | string) { } } +export function start(entry?: NavigationEntry | string) { + console.log("application.start() is deprecated; use application.run() instead"); + _start(entry); +} + export function shouldCreateRootFrame(): boolean { return createRootFrame.value; } export function run(entry?: NavigationEntry | string) { createRootFrame.value = false; - start(entry); + _start(entry); } const CALLBACKS = "_callbacks"; diff --git a/tns-core-modules/application/application.ios.ts b/tns-core-modules/application/application.ios.ts index 5d49fb857..53941c9ef 100644 --- a/tns-core-modules/application/application.ios.ts +++ b/tns-core-modules/application/application.ios.ts @@ -299,9 +299,7 @@ export function getRootView() { // NOTE: for backwards compatibility. Remove for 4.0.0. const createRootFrame = { value: true }; let started: boolean = false; -export function start(entry?: string | NavigationEntry) { - console.log("application.start() is deprecated; use application.run() instead"); - +function _start(entry?: string | NavigationEntry) { mainEntry = typeof entry === "string" ? { moduleName: entry } : entry; started = true; @@ -333,9 +331,14 @@ export function start(entry?: string | NavigationEntry) { } } +export function start(entry?: string | NavigationEntry) { + console.log("application.start() is deprecated; use application.run() instead"); + _start(entry); +} + export function run(entry?: string | NavigationEntry) { createRootFrame.value = false; - start(entry); + _start(entry); } export function _resetRootView(entry?: NavigationEntry | string) {