Mastodon/Pinafore-Web-Client-Frontend
1
0
Fork 0
mirror of https://github.com/nolanlawson/pinafore synced 2024-12-12 02:07:26 +01:00
Code Issues Releases Wiki Activity

remove link rel=manifest for iOS (#443)

Browse Source 
fixes #45 in a better way than before
This commit is contained in:
Nolan Lawson 2018-08-18 23:14:30 -07:00 committed by GitHub
parent a6039f6247
commit 1aeb57fb57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inline-script.js
View File

@ -34,3 +34,9 @@ if (!localStorage.store_currentInstance) {
style.textContent = '.hidden-from-ssr { opacity: 1 !important; }' style.textContent = '.hidden-from-ssr { opacity: 1 !important; }'
document.head.appendChild(style) document.head.appendChild(style)
} }
// TODO: remove this hack when Safari works with cross-origin window.open()
// in a PWA: https://github.com/nolanlawson/pinafore/issues/45
if (/iP(?:hone|ad|od)/.test(navigator.userAgent)) {
document.head.removeChild(document.getElementById('theManifest'))
}

11
server.js
View File

@ -48,17 +48,6 @@ app.use(nonDebugOnly(helmet({
} }
}))) })))
// TODO: remove this hack when Safari works with cross-origin window.open()
// in a PWA: https://github.com/nolanlawson/pinafore/issues/45
app.get('/manifest.json', (req, res, next) => {
if (/iP(?:hone|ad|od)/.test(req.headers['user-agent'])) {
return res.status(404).send({
error: 'manifest.json is disabled for iOS. see https://github.com/nolanlawson/pinafore/issues/45'
})
}
return next()
})
app.use(serveStatic('assets', { app.use(serveStatic('assets', {
setHeaders: (res) => { setHeaders: (res) => {
res.setHeader('Cache-Control', 'public,max-age=600') res.setHeader('Cache-Control', 'public,max-age=600')

8
templates/2xx.html
View File

@ -6,7 +6,7 @@
<meta id='theThemeColor' name='theme-color' content='#4169e1' > <meta id='theThemeColor' name='theme-color' content='#4169e1' >
<meta name="description" content="An alternative web client for Mastodon, focused on speed and simplicity." > <meta name="description" content="An alternative web client for Mastodon, focused on speed and simplicity." >
<link rel='manifest' href='/manifest.json' > <link id='theManifest' rel='manifest' href='/manifest.json' >
<link id='theFavicon' rel='icon' type='image/png' href='/favicon.png' > <link id='theFavicon' rel='icon' type='image/png' href='/favicon.png' >
<link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120.png" > <link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120.png" >
<link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180.png" > <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180.png" >
@ -77,6 +77,12 @@ if (!localStorage.store_currentInstance) {
style.textContent = '.hidden-from-ssr { opacity: 1 !important; }' style.textContent = '.hidden-from-ssr { opacity: 1 !important; }'
document.head.appendChild(style) document.head.appendChild(style)
} }
// TODO: remove this hack when Safari works with cross-origin window.open()
// in a PWA: https://github.com/nolanlawson/pinafore/issues/45
if (/iP(?:hone|ad|od)/.test(navigator.userAgent)) {
document.head.removeChild(document.getElementById('theManifest'))
}
})()</script><!-- end insert inline script here --> })()</script><!-- end insert inline script here -->
<svg xmlns="http://www.w3.org/2000/svg" style="display:none;"> <svg xmlns="http://www.w3.org/2000/svg" style="display:none;">
<!-- auto-generated w/ build-svg.js --> <!-- auto-generated w/ build-svg.js -->