admin/cobalt
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

web: more ipad accommodations and clean up

Browse Source 
- moved all user agent toggles to (legacy) frontend, like it should have always been
- removed unnecessary building
This commit is contained in:
wukko
2024-05-11 01:05:24 +06:00
parent 0e6ea09b16
commit e2d1913043
5 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/pageRender/findRendered.js
View File

@@ -1,11 +1,6 @@
import { languageList } from "../../localization/manager.js";
export default function(lang, userAgent) {
export default function(lang) {
let language = languageList.includes(lang) ? lang : "en";
let ua = userAgent.toLowerCase();
let platform = (ua.match("android") || ua.match("iphone os")) ? "mob" : "pc";
if (platform === "mob" && ua.match("iphone os")) platform = "ios";
return `/build/${platform}/${language}.html`;
return `/build/${language}.html`;
}

22
src/modules/pageRender/page.js
View File

@@ -47,14 +47,9 @@ for (let i in donations["crypto"]) {
}
export default function(obj) {
const t = (str, replace) => { return loc(obj.lang, str, replace) };
let ua = obj.useragent.toLowerCase();
let isIOS = ua.match("iphone os");
let isMobile = ua.match("android") || ua.match("iphone os");
let platform = isMobile ? "m" : "d";
if (isMobile && isIOS) platform = "i";
const t = (str, replace) => {
return loc(obj.lang, str, replace)
}
audioFormats[0]["text"] = t('SettingsAudioFormatBest');
@@ -64,7 +59,7 @@ export default function(obj) {
<html lang="${obj.lang}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="viewport-fit=cover, width=device-width, height=device-height, initial-scale=1, maximum-scale=${isIOS ? `1` : `5`}">
<meta name="viewport" content="viewport-fit=cover, width=device-width, height=device-height, initial-scale=1, maximum-scale=1">
<title>${t("AppTitleCobalt")}</title>
@@ -103,7 +98,7 @@ export default function(obj) {
></script>`
: ''}
</head>
<body id="cobalt-body" ${platform === "d" ? 'class="desktop"' : ''}>
<body id="cobalt-body">
<noscript>
<div style="margin: 2rem;">${t('NoScriptMessage')}</div>
</noscript>
@@ -314,7 +309,7 @@ export default function(obj) {
closeAria: t('AccessibilityGoBack'),
header: {
aboveTitle: {
text: `v.${version}-${obj.hash}${platform} (${obj.branch})`,
text: `v.${version}-${obj.hash} (${obj.branch})`,
url: `${repo}/commit/${obj.hash}`
},
title: `${emoji("⚙️", 30)} ${t('TitlePopupSettings')}`
@@ -562,7 +557,7 @@ export default function(obj) {
},
body: switcher({
name: "download",
explanation: `${!isIOS ? t('DownloadPopupDescription') : t('DownloadPopupDescriptionIOS')}`,
explanation: t('DownloadPopupDescription'),
items: `<a id="pd-download" class="switch full" target="_blank" href="/"><span>${t('Download')}</span></a>
<div id="pd-share" class="switch full">${t('ShareURL')}</div>
<div id="pd-copy" class="switch full">${t('CopyURL')}</div>`
@@ -656,7 +651,8 @@ export default function(obj) {
'DataTransferError',
'FilenamePreviewVideoTitle',
'FilenamePreviewAudioTitle',
'FilenamePreviewAudioAuthor'
'FilenamePreviewAudioAuthor',
'DownloadPopupDescriptionIOS'
])}
</script>
<script src="cobalt.js"></script>