supernets/hardlounge
supernets/hardlounge
5
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3663 from thelounge/xpaw/cyclical-dep

Browse Source 
Remove cyclical dependency in router<->webpush
This commit is contained in:
Pavel Djundik 2020-01-04 15:20:23 +02:00 committed by GitHub
commit 00cdb6e808
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/js/router.js
View File

@ -142,4 +142,18 @@ function switchToChannel(channel) {
return navigate("RoutedChat", {id: channel.id}); return navigate("RoutedChat", {id: channel.id});
} }
if ("serviceWorker" in navigator) {
navigator.serviceWorker.addEventListener("message", (event) => {
if (event.data && event.data.type === "open") {
const id = parseInt(event.data.channel.substr(5), 10); // remove "chan-" prefix
const channelTarget = store.getters.findChannel(id);
if (channelTarget) {
switchToChannel(channelTarget.channel);
}
}
});
}
export {initialize, router, navigate, switchToChannel}; export {initialize, router, navigate, switchToChannel};

15
client/js/webpush.js
View File

@ -2,24 +2,9 @@
import socket from "./socket"; import socket from "./socket";
import store from "./store"; import store from "./store";
import {switchToChannel} from "./router";
export default {togglePushSubscription}; export default {togglePushSubscription};
if ("serviceWorker" in navigator) {
navigator.serviceWorker.addEventListener("message", (event) => {
if (event.data && event.data.type === "open") {
const id = parseInt(event.data.channel.substr(5), 10); // remove "chan-" prefix
const channelTarget = store.getters.findChannel(id);
if (channelTarget) {
switchToChannel(channelTarget.channel);
}
}
});
}
socket.once("push:issubscribed", function(hasSubscriptionOnServer) { socket.once("push:issubscribed", function(hasSubscriptionOnServer) {
if (!isAllowedServiceWorkersHost()) { if (!isAllowedServiceWorkersHost()) {
store.commit("pushNotificationState", "nohttps"); store.commit("pushNotificationState", "nohttps");