github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 19:23:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: close panel earlier (#21512)

Browse Source 
deactivate was happening too late and sometimes after we did reopen for next panel causing the panel to stay effectively closed
This commit is contained in:
Joffrey JAFFEUX 2023-05-11 21:15:31 +02:00 committed by GitHub
parent bd6e487df0
commit e905de66ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
import DiscourseRoute from "discourse/routes/discourse";
import { inject as service } from "@ember/service";
import { action } from "@ember/object";
export default class ChatChannelThread extends DiscourseRoute {
@service router;
@ -24,7 +25,8 @@ export default class ChatChannelThread extends DiscourseRoute {
this.chatChannelThreadPane.open(model);
}
deactivate() {
@action
willTransition() {
this.chatChannelThreadPane.close();
}

11
plugins/chat/assets/javascripts/discourse/routes/chat-channel-threads.js
View File

@ -1,14 +1,10 @@
import DiscourseRoute from "discourse/routes/discourse";
import { inject as service } from "@ember/service";
import { action } from "@ember/object";
export default class ChatChannelThreads extends DiscourseRoute {
@service router;
@service chatChannelThreadListPane;
deactivate() {
this.chatChannelThreadListPane.close();
}
beforeModel(transition) {
const channel = this.modelFor("chat.channel");
@ -19,6 +15,11 @@ export default class ChatChannelThreads extends DiscourseRoute {
}
}
@action
willTransition() {
this.chatChannelThreadListPane.close();
}
activate() {
this.chatChannelThreadListPane.open();
}