Side bar fix.
This commit is contained in:
parent
8ea41bb592
commit
fbe95d6631
@ -33,14 +33,7 @@
|
|||||||
</header>
|
</header>
|
||||||
<main>
|
<main>
|
||||||
{% block sidebar %}
|
{% block sidebar %}
|
||||||
<aside class="sidebar">
|
{% include "sidebar_channels.html" %}
|
||||||
<h2 class="no-select">Channels</h2>
|
|
||||||
<ul>
|
|
||||||
{% for channel in channels %}
|
|
||||||
<li><a class="no-select" href="/channel/{{channel['uid']}}.html">{{channel['name']}}</a></li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</aside>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block main %}
|
{% block main %}
|
||||||
<chat-window class="chat-area"></chat-window>
|
<chat-window class="chat-area"></chat-window>
|
||||||
|
@ -132,6 +132,7 @@
|
|||||||
app.addEventListener("channel-message", (data) => {
|
app.addEventListener("channel-message", (data) => {
|
||||||
if (data.channel_uid !== channelUid) {
|
if (data.channel_uid !== channelUid) {
|
||||||
if(!isMentionForSomeoneElse(data.message)){
|
if(!isMentionForSomeoneElse(data.message)){
|
||||||
|
channelSidebar.notify(data);
|
||||||
app.playSound("messageOtherChannel");
|
app.playSound("messageOtherChannel");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ class WebView(BaseView):
|
|||||||
other_user = await self.app.services.channel_member.get_other_dm_user(subscribed_channel["channel_uid"], self.session.get("uid"))
|
other_user = await self.app.services.channel_member.get_other_dm_user(subscribed_channel["channel_uid"], self.session.get("uid"))
|
||||||
if other_user:
|
if other_user:
|
||||||
item["name"] = other_user["nick"]
|
item["name"] = other_user["nick"]
|
||||||
item["uid"] = other_user["uid"]
|
item["uid"] = subscribed_channel["channel_uid"]
|
||||||
else:
|
else:
|
||||||
item["name"] = subscribed_channel["label"]
|
item["name"] = subscribed_channel["label"]
|
||||||
item["uid"] = subscribed_channel["channel_uid"]
|
item["uid"] = subscribed_channel["channel_uid"]
|
||||||
|
Loading…
Reference in New Issue
Block a user