IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-19 01:14:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

FIX: ensures activeMessage is reset with channel (#21031)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2023-04-10 08:10:01 +02:00
committed by GitHub
parent c7b49a14c7
commit c1dc6a2db4
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
-1
View File
@@ -34,7 +34,6 @@ export default {
return dasherize(this.channel.slugifiedTitle);
}
@computed("chatService.activeChannel")
get classNames() {
const classes = [];
plugins/chat/assets/javascripts/discourse/services/chat.js
+13 -2
View File
@@ -30,8 +30,6 @@ export default class Chat extends Service {
@service chatChannelPane;
@service chatChannelThreadPane;
@tracked activeChannel = null;
cook = null;
presenceChannel = null;
sidebarActive = false;
@@ -40,6 +38,19 @@ export default class Chat extends Service {
@and("currentUser.has_chat_enabled", "siteSettings.chat_enabled") userCanChat;
@tracked _activeMessage = null;
@tracked _activeChannel = null;
get activeChannel() {
return this._activeChannel;
}
set activeChannel(channel) {
if (!channel) {
this._activeMessage = null;
}
this._activeChannel = channel;
}
@computed("currentUser.staff", "currentUser.groups.[]")
get userCanDirectMessage() {