github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-31 16:01:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5832 from featheredtoast/safari-no-serviceworkers

Browse Source 
Fix: Safari failing to download backups from email links
This commit is contained in:
Guo Xiang Tan 2018-05-24 15:44:51 +08:00 committed by GitHub
commit 0e284e54f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
View File

@ -6,9 +6,10 @@ export default {
(location.hostname === "localhost");
const isSupported= isSecured && ('serviceWorker' in navigator);
const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
if (isSupported) {
if (Discourse.ServiceWorkerURL) {
if (Discourse.ServiceWorkerURL && !isSafari) {
navigator.serviceWorker
.register(`${Discourse.BaseUri}/${Discourse.ServiceWorkerURL}`)
.catch(error => {

4
app/assets/javascripts/service-worker.js.erb
View File

@ -65,6 +65,10 @@ self.addEventListener('activate', function(event) {
});
self.addEventListener('fetch', function(event) {
// Bypass service workers if this is a url with a token param
if(/\?.*token/i.test(event.request.url)) {
return;
}
// We only want to call event.respondWith() if this is a navigation request
// for an HTML page.
// request.mode of 'navigate' is unfortunately not supported in Chrome