diff --git a/src/components/confirm/confirm.ts b/src/components/confirm/confirm.ts index 3b40a8f2b4..5301fc79b8 100644 --- a/src/components/confirm/confirm.ts +++ b/src/components/confirm/confirm.ts @@ -1,7 +1,6 @@ import dialog from 'components/dialog/dialog'; import { appRouter } from 'components/router/appRouter'; import globalize from 'lib/globalize'; -import browser from 'scripts/browser'; interface OptionItem { id: string, @@ -18,34 +17,7 @@ interface ConfirmOptions { buttons?: OptionItem[] } -function shouldUseNativeConfirm() { - // webOS seems to block modals - // Tizen 2.x seems to block modals - return !browser.web0s - && !(browser.tizenVersion && (browser.tizenVersion < 3 || browser.tizenVersion >= 8)) - && browser.tv - && !!window.confirm; -} - -async function nativeConfirm(options: string | ConfirmOptions) { - if (typeof options === 'string') { - options = { - text: options - } as ConfirmOptions; - } - - const text = (options.text || '').replace(//g, '\n'); - await appRouter.ready(); - const result = window.confirm(text); - - if (result) { - return Promise.resolve(); - } else { - return Promise.reject(new Error('Confirm dialog rejected')); - } -} - -async function customConfirm(options: string | ConfirmOptions, title: string = '') { +async function confirm(options: string | ConfirmOptions, title: string = '') { if (typeof options === 'string') { options = { title, @@ -80,6 +52,4 @@ async function customConfirm(options: string | ConfirmOptions, title: string = ' }); } -const confirm = shouldUseNativeConfirm() ? nativeConfirm : customConfirm; - export default confirm;