Skip to content

Commit 9bff567

Browse files
committed
Fixes #1796
1 parent f1e1e53 commit 9bff567

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

CHANGES.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
- #129: Add support for [XEP-0156: Disovering Alternative XMPP Connection Methods](https://xmpp.org/extensions/xep-0156.html). Only XML is supported for now.
1919
- #1105: Preliminary support for storing persistent data in IndexedDB instead of localStorage
2020
- #1691: Fix `collection.chatbox is undefined` errors
21-
- #1772 `_converse.api.contact.add(jid, nick)` fails, says not a function
21+
- #1772: `_converse.api.contact.add(jid, nick)` fails, says not a function
22+
- #1796: Don't show "back" arrow navigation (on mobile) in the chat header when in `singleton` mode
2223

2324
### Breaking changes
2425

src/converse-muc-views.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -1038,12 +1038,15 @@ converse.plugins.add('converse-muc-views', {
10381038
}));
10391039
},
10401040

1041+
/**
1042+
* Callback method that gets called after the chat has become visible.
1043+
* @private
1044+
* @method _converse.ChatRoomView#afterShown
1045+
*/
10411046
afterShown () {
1042-
/* Override from converse-chatview, specifically to avoid
1043-
* the 'active' chat state from being sent out prematurely.
1044-
*
1045-
* This is instead done in `onConnectionStatusChanged` below.
1046-
*/
1047+
// Override from converse-chatview, specifically to avoid
1048+
// the 'active' chat state from being sent out prematurely.
1049+
// This is instead done in `onConnectionStatusChanged` below.
10471050
if (u.isPersistableModel(this.model)) {
10481051
this.model.clearUnreadMsgCounter();
10491052
}

src/templates/chatbox_head.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<div class="chat-head chat-head-chatbox row no-gutters">
2-
<div class="chatbox-navback"><i class="fa fa-arrow-left"></i></div>
2+
{[ if (!o._converse.singleton) { ]}
3+
<div class="chatbox-navback"><i class="fa fa-arrow-left"></i></div>
4+
{[ } ]}
35
<div class="chatbox-title">
46
<div class="row no-gutters">
57
{[ if (o.type !== o._converse.HEADLINES_TYPE) { ]}

src/templates/chatroom_head.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<div class="chatbox-navback"><i class="fa fa-arrow-left"></i></div>
1+
{[ if (!o._converse.singleton) { ]}
2+
<div class="chatbox-navback"><i class="fa fa-arrow-left"></i></div>
3+
{[ } ]}
24
<div class="chatbox-title">
35
<div class="chat-title" {[ if (o._converse.locked_muc_domain !== 'hidden') { ]} title="{{{o.jid}}}" {[ } ]} >
46
{{{ o.title }}}

0 commit comments

Comments
 (0)