deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-09 01:36:42 +02:00
Code Issues Projects Releases Wiki Activity

Use switchToChannel instead of click

Browse source
This commit is contained in:
Pavel Djundik 2019-11-07 11:29:04 +02:00
parent 25da9dd63e
commit 80c6cfbd7c
4 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/components/Windows/NetworkEdit.vue
View file

@ -8,9 +8,7 @@
</template>
<script>
const $ = require("jquery");
const socket = require("../../js/socket");
import NetworkForm from "../NetworkForm.vue";
export default {
@ -41,11 +39,11 @@ export default {
this.disabled = true;
socket.emit("network:edit", data);
const sidebar = $("#sidebar");
// TODO: move networks to vuex and update state when the network info comes in
const network = this.$store.getters.findNetwork(data.uuid);
network.name = network.channels[0].name = data.name;
sidebar.find(`.network[data-uuid="${data.uuid}"] .chan.lobby .name`).click();
this.$root.switchToChannel(network.channels[0]);
},
},
};

6
client/js/socket-events/msg.js
View file

@ -155,12 +155,10 @@ function notifyMessage(targetId, channel, activeChannel, msg) {
this.close();
window.focus();
const channelTarget = document.querySelector(
"#sidebar .chan[data-id='" + targetId + "']"
);
const channelTarget = store.getters.findChannel(targetId);
if (channelTarget) {
channelTarget.click();
vueApp.switchToChannel(channelTarget);
}
});
}

8
client/js/webpush.js
View file

@ -2,6 +2,7 @@
const storage = require("./localStorage");
const socket = require("./socket");
const vueApp = require("./vue");
const store = require("./store").default;
let clientSubscribed = null;
@ -10,12 +11,11 @@ let applicationServerKey;
if ("serviceWorker" in navigator) {
navigator.serviceWorker.addEventListener("message", (event) => {
if (event.data && event.data.type === "open") {
const channelTarget = document.querySelector(
"#sidebar .chan[data-target='#" + event.data.channel + "']"
);
const id = event.data.channel.substr(5); // remove "chan-" prefix
const channelTarget = store.getters.findChannel(id);
if (channelTarget) {
channelTarget.click();
vueApp.switchToChannel(channelTarget);
}
}
});

2
client/service-worker.js
View file

@ -156,7 +156,7 @@ self.addEventListener("notificationclick", function(event) {
.then((clientList) => {
if (clientList.length === 0) {
if (clients.openWindow) {
return clients.openWindow(`.#${event.notification.tag}`);
return clients.openWindow(`.#/${event.notification.tag}`);
}
return;