From b43140e0216de2ba784b092d154a0c596aa0ccb0 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 17 Jan 2025 12:30:43 +0100 Subject: [PATCH] DEV: sidebarActive is not used anymore (#30268) This was used in the past to show a chat sidebar when the core sidebar was not existing. --- .../javascripts/discourse/services/chat.js | 1 - .../javascripts/discourse/templates/chat.hbs | 42 ++++++++----------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/plugins/chat/assets/javascripts/discourse/services/chat.js b/plugins/chat/assets/javascripts/discourse/services/chat.js index afe76f77cbf..63f8a21a033 100644 --- a/plugins/chat/assets/javascripts/discourse/services/chat.js +++ b/plugins/chat/assets/javascripts/discourse/services/chat.js @@ -35,7 +35,6 @@ export default class Chat extends Service { cook = null; presenceChannel = null; - sidebarActive = false; isNetworkUnreliable = false; @and("currentUser.has_chat_enabled", "siteSettings.chat_enabled") userCanChat; diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat.hbs b/plugins/chat/assets/javascripts/discourse/templates/chat.hbs index 292f53880b8..40cd71798cc 100644 --- a/plugins/chat/assets/javascripts/discourse/templates/chat.hbs +++ b/plugins/chat/assets/javascripts/discourse/templates/chat.hbs @@ -1,28 +1,22 @@
-{{#if this.chat.sidebarActive}} -
- {{outlet}} -
-{{else}} -
- {{#if this.shouldUseChatSidebar}} - - {{/if}} +
+ {{#if this.shouldUseChatSidebar}} + + {{/if}} -
- {{outlet}} - {{#if this.shouldUseChatFooter}} - - {{/if}} -
+
+ {{outlet}} + {{#if this.shouldUseChatFooter}} + + {{/if}}
-{{/if}} \ No newline at end of file +
\ No newline at end of file