gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

feat(push-notifications): Open link in current tab if possible (#4228)

Browse source 
* fix(push-notification): Open link in current tab if possible

* feat(sw): Skip waiting and claim clients
This commit is contained in:
Sorin Davidoi 2017-07-18 00:19:17 +02:00 • committed by Eugen Rochko
parent b11ac88692
commit 719ab720a7
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/mastodon/service_worker/entry.js
View file

@ -1 +1,10 @@
import './web_push_notifications';
// Cause a new version of a registered Service Worker to replace an existing one
// that is already installed, and replace the currently active worker on open pages.
self.addEventListener('install', function(event) {
event.waitUntil(self.skipWaiting());
});
self.addEventListener('activate', function(event) {
event.waitUntil(self.clients.claim());
});

20
app/javascript/mastodon/service_worker/web_push_notifications.js
View file

@ -50,6 +50,24 @@ const makeRequest = (notification, action) =>
credentials: 'include',
});
const openUrl = url =>
self.clients.matchAll({ type: 'window' }).then(clientList => {
if (clientList.length !== 0 && 'navigate' in clientList[0]) { // Chrome 42-48 does not support navigate
const webClients = clientList
.filter(client => /\/web\//.test(client.url))
.sort(client => client !== 'visible');
const visibleClient = clientList.find(client => client.visibilityState === 'visible');
const focusedClient = clientList.find(client => client.focused);
const client = webClients[0] || visibleClient || focusedClient || clientList[0];
return client.navigate(url).then(client => client.focus());
} else {
return self.clients.openWindow(url);
}
});
const removeActionFromNotification = (notification, action) => {
const actions = notification.actions.filter(act => act.action !== action.action);
@ -75,7 +93,7 @@ const handleNotificationClick = (event) => {
}
} else {
event.notification.close();
resolve(self.clients.openWindow(event.notification.data.url));
resolve(openUrl(event.notification.data.url));
}
});