IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: deactivate is not called in every cases (#19301)

Browse Source 
Resets active channel each time we transition through "chat" route.
This commit is contained in:
Joffrey JAFFEUX 2022-12-02 18:28:15 +01:00 committed by GitHub
parent ef31c7df63
commit 801b3f087f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/chat/assets/javascripts/discourse/routes/chat.js
View File

@ -66,8 +66,6 @@ export default class ChatRoute extends DiscourseRoute {
} }
deactivate() { deactivate() {
this.chat.setActiveChannel(null);
schedule("afterRender", () => { schedule("afterRender", () => {
document.body.classList.remove("has-full-page-chat"); document.body.classList.remove("has-full-page-chat");
document.documentElement.classList.remove("has-full-page-chat"); document.documentElement.classList.remove("has-full-page-chat");
@ -77,6 +75,8 @@ export default class ChatRoute extends DiscourseRoute {
@action @action
willTransition(transition) { willTransition(transition) {
this.chat.setActiveChannel(null);
if (!transition?.to?.name?.startsWith("chat.")) { if (!transition?.to?.name?.startsWith("chat.")) {
this.chatStateManager.storeChatURL(); this.chatStateManager.storeChatURL();
this.chat.updatePresence(); this.chat.updatePresence();