diff --git a/CHANGES.md b/CHANGES.md index f021407888..5b1dd05cb2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,7 @@ - Bugfix. Handler not triggered when submitting MUC password form 2nd time - Bugfix. MUC features weren't being refreshed when saving the config form +- #1063 URLs in the topic / subject are not clickable - #1190 MUC Participants column disappears in certain viewport widths - #1199 Can't get back from to login screen from registration screen - #1214 Setting `allow_contact_requests` to `false` has no effect diff --git a/css/converse.css b/css/converse.css index dc8f15bcc5..52027c07b4 100644 --- a/css/converse.css +++ b/css/converse.css @@ -10394,6 +10394,9 @@ body.reset { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } + #conversejs.converse-embedded .chat-head-chatroom .chatroom-description a, + #conversejs .chat-head-chatroom .chatroom-description a { + color: white; } #conversejs.converse-embedded .chat-head-chatroom a.chatbox-btn.fa, #conversejs.converse-embedded .chat-head-chatroom a:visited.chatbox-btn.fa, #conversejs.converse-embedded .chat-head-chatroom a:hover.chatbox-btn.fa, #conversejs.converse-embedded .chat-head-chatroom a:not([href]):not([tabindex]).chatbox-btn.fa, #conversejs .chat-head-chatroom a.chatbox-btn.fa, #conversejs .chat-head-chatroom a:visited.chatbox-btn.fa, diff --git a/dist/converse.js b/dist/converse.js index 55df7e7665..145cb6aac8 100644 --- a/dist/converse.js +++ b/dist/converse.js @@ -68850,7 +68850,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ 'info_close': __('Close and leave this groupchat'), 'info_configure': __('Configure this groupchat'), 'info_details': __('Show more details about this groupchat'), - 'description': _.get(this.model.get('subject'), 'text') || '' + 'description': u.addHyperlinks(xss.filterXSS(_.get(this.model.get('subject'), 'text'), { + 'whiteList': {} + })) })); }, @@ -69880,7 +69882,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ 'data': '', 'isodate': date, 'extra_classes': 'chat-topic', - 'message': subject.text + 'message': u.addHyperlinks(xss.filterXSS(_.get(this.model.get('subject'), 'text'), { + 'whiteList': {} + })), + 'render_message': true })); } @@ -78970,10 +78975,10 @@ __e( o.Strophe.getNodeFromJid(o.jid) ) + __e( o.Strophe.getDomainFromJid(o.jid) ) + '\n '; } ; -__p += '\n \n

' + -__e(o.description) + +((__t = (o.description)) == null ? '' : __t) + '

\n\n
\n \n '; @@ -79670,16 +79675,31 @@ return __p var _ = {escape:__webpack_require__(/*! ./node_modules/lodash/escape.js */ "./node_modules/lodash/escape.js")}; module.exports = function(o) { -var __t, __p = '', __e = _.escape; -__p += '\n
' + +((__t = (o.message)) == null ? '' : __t) + +'
\n'; + } else { ; +__p += '\n
' + __e(o.message) + '
\n'; + } ; +__p += '\n'; return __p }; diff --git a/sass/_chatrooms.scss b/sass/_chatrooms.scss index 5d39775904..2a99492b1c 100644 --- a/sass/_chatrooms.scss +++ b/sass/_chatrooms.scss @@ -44,6 +44,9 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + a { + color: white; + } } a, a:visited, a:hover, a:not([href]):not([tabindex]) { diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js index 8aff86985d..825d21d684 100644 --- a/src/converse-muc-views.js +++ b/src/converse-muc-views.js @@ -694,7 +694,7 @@ 'info_close': __('Close and leave this groupchat'), 'info_configure': __('Configure this groupchat'), 'info_details': __('Show more details about this groupchat'), - 'description': _.get(this.model.get('subject'), 'text') || '' + 'description': u.addHyperlinks(xss.filterXSS(_.get(this.model.get('subject'), 'text'), {'whiteList': {}})), })); }, @@ -1665,7 +1665,8 @@ 'data': '', 'isodate': date, 'extra_classes': 'chat-topic', - 'message': subject.text + 'message': u.addHyperlinks(xss.filterXSS(_.get(this.model.get('subject'), 'text'), {'whiteList': {}})), + 'render_message': true })); } this.scrollDown(); diff --git a/src/templates/chatroom_head.html b/src/templates/chatroom_head.html index 234c28b9b3..ad1873e2d2 100644 --- a/src/templates/chatroom_head.html +++ b/src/templates/chatroom_head.html @@ -7,7 +7,8 @@ {{{ o.Strophe.getNodeFromJid(o.jid) }}}@{{{ o.Strophe.getDomainFromJid(o.jid) }}} {[ } ]}
-

{{{o.description}}}

+ +

{{o.description}}

diff --git a/src/templates/info.html b/src/templates/info.html index 5a47c5266e..4c306a9090 100644 --- a/src/templates/info.html +++ b/src/templates/info.html @@ -1,3 +1,10 @@ -
{{{o.message}}}
+{[ if (o.render_message) { ]} + +
{{o.message}}
+{[ } else { ]} +
{{{o.message}}}
+{[ } ]}