Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Bookmark icon shown in open rooms list when allow_bookmarks set to false

Browse Source
This commit is contained in:
JC Brand 2017-07-19 09:28:44 +02:00
parent 0edb38e2c6
commit 6ac01ed2ac
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -26,6 +26,8 @@
- Room name wasn't being updated after changing it in the configuration form. [jcbrand] - Room name wasn't being updated after changing it in the configuration form. [jcbrand]
- Server disco features were "forgotten" after logging out and then logging in again. [jcbrand] - Server disco features were "forgotten" after logging out and then logging in again. [jcbrand]
- Don't show duplicate sent groupchat messages in Slack chat rooms. [jcbrand] - Don't show duplicate sent groupchat messages in Slack chat rooms. [jcbrand]
- Bookmark icon shown in the open rooms list when `allow_bookmarks` is to `false`. [jcbrand]
- #879 Text in links are converted to smileys leading to non-clickable links.
## 3.1.1 (2017-07-12) ## 3.1.1 (2017-07-12)

1
src/converse-roomslist.js
View File

@ -117,6 +117,7 @@
} }
const div = document.createElement('div'); const div = document.createElement('div');
div.innerHTML = tpl_rooms_list_item(_.extend(item.toJSON(), { div.innerHTML = tpl_rooms_list_item(_.extend(item.toJSON(), {
'allow_bookmarks': _converse.allow_bookmarks,
'info_leave_room': __('Leave this room'), 'info_leave_room': __('Leave this room'),
'info_remove_bookmark': __('Unbookmark this room'), 'info_remove_bookmark': __('Unbookmark this room'),
'info_title': __('Show more information on this room'), 'info_title': __('Show more information on this room'),

3
src/templates/rooms_list_item.html
View File

@ -9,9 +9,12 @@
data-room-jid="{{{jid}}}" data-room-jid="{{{jid}}}"
data-room-name="{{{name}}}" data-room-name="{{{name}}}"
title="{{{info_leave_room}}}" href="#">&nbsp;</a> title="{{{info_leave_room}}}" href="#">&nbsp;</a>
{[ if (allow_bookmarks) { ]}
<a class="right remove-bookmark icon-pushpin {[ if (bookmarked) { ]} button-on {[ } ]}" <a class="right remove-bookmark icon-pushpin {[ if (bookmarked) { ]} button-on {[ } ]}"
data-room-jid="{{{jid}}}" data-bookmark-name="{{{name}}}" data-room-jid="{{{jid}}}" data-bookmark-name="{{{name}}}"
title="{{{info_remove_bookmark}}}" href="#">&nbsp;</a> title="{{{info_remove_bookmark}}}" href="#">&nbsp;</a>
{[ } ]}
<a class="right room-info icon-room-info" data-room-jid="{{{jid}}}" <a class="right room-info icon-room-info" data-room-jid="{{{jid}}}"
title="{{{info_title}}}" href="#">&nbsp;</a> title="{{{info_title}}}" href="#">&nbsp;</a>
</dd> </dd>