diff --git a/src/components/alert.js b/src/components/alert.js index 7d3ef34dff..a4689c79ac 100644 --- a/src/components/alert.js +++ b/src/components/alert.js @@ -30,8 +30,9 @@ import globalize from '../scripts/globalize'; options = text; } + await appRouter.ready(); + if (useNativeAlert()) { - await appRouter.ready(); alert(replaceAll(options.text || '', '
', '\n')); return Promise.resolve(); } else { diff --git a/src/components/confirm/confirm.js b/src/components/confirm/confirm.js index ac2315f533..0624fb3ffb 100644 --- a/src/components/confirm/confirm.js +++ b/src/components/confirm/confirm.js @@ -35,7 +35,7 @@ async function nativeConfirm(options) { } } -function customConfirm(text, title) { +async function customConfirm(text, title) { let options; if (typeof text === 'string') { options = { @@ -62,6 +62,8 @@ function customConfirm(text, title) { options.buttons = items; + await appRouter.ready(); + return dialog.show(options).then(result => { if (result === 'ok') { return Promise.resolve(); diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js index fbaf86a024..8a6a22fd15 100644 --- a/src/components/dialogHelper/dialogHelper.js +++ b/src/components/dialogHelper/dialogHelper.js @@ -184,9 +184,7 @@ import '../../assets/css/scrollstyles.scss'; return dlg.getAttribute('data-history') === 'true'; } - export async function open(dlg) { - await appRouter.ready(); - + export function open(dlg) { if (globalOnOpenCallback) { globalOnOpenCallback(dlg); }