Merge pull request #3031 from dmitrylyzo/webos-modals

This commit is contained in:
Bill Thornton
2021-10-25 08:12:23 -04:00
committed by GitHub
2 changed files with 20 additions and 2 deletions
+10 -1
View File
@@ -10,6 +10,15 @@ import globalize from '../scripts/globalize';
return originalString.replace(reg, strWith);
}
function useNativeAlert() {
// webOS seems to block modals
// Tizen 2.x seems to block modals
return !browser.web0s
&& !(browser.tizenVersion && browser.tizenVersion < 3)
&& browser.tv
&& window.alert;
}
export default async function (text, title) {
let options;
if (typeof text === 'string') {
@@ -21,7 +30,7 @@ import globalize from '../scripts/globalize';
options = text;
}
if (browser.tv && window.alert) {
if (useNativeAlert()) {
await appRouter.ready();
alert(replaceAll(options.text || '', '<br/>', '\n'));
return Promise.resolve();
+10 -1
View File
@@ -7,6 +7,15 @@ function replaceAll(str, find, replace) {
return str.split(find).join(replace);
}
function useNativeConfirm() {
// webOS seems to block modals
// Tizen 2.x seems to block modals
return !browser.web0s
&& !(browser.tizenVersion && browser.tizenVersion < 3)
&& browser.tv
&& window.confirm;
}
async function nativeConfirm(options) {
if (typeof options === 'string') {
options = {
@@ -62,6 +71,6 @@ function customConfirm(text, title) {
});
}
const confirm = browser.tv && window.confirm ? nativeConfirm : customConfirm;
const confirm = useNativeConfirm() ? nativeConfirm : customConfirm;
export default confirm;