diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
| commit | 449739e6a364759a86f73417626af49d6a794e3d (patch) | |
| tree | 04b2f39c91ec6098ffe3b380442787ac3ce2908f /webclient/room/room.html | |
| parent | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse (diff) | |
| parent | Check that we have auth headers and fail nicely (diff) | |
| download | synapse-449739e6a364759a86f73417626af49d6a794e3d.tar.xz | |
Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse
Diffstat (limited to 'webclient/room/room.html')
| -rw-r--r-- | webclient/room/room.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index b99413cbbf..79a60585a5 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -121,7 +121,9 @@ <span ng-show='msg.content.msgtype === "m.text"' class="message" ng-class="containsBingWord(msg.content.body) && msg.user_id != state.user_id ? msg.echo_msg_state + ' messageBing' : msg.echo_msg_state" - ng-bind-html="((msg.content.msgtype === 'm.text') ? msg.content.body : '') | linky:'_blank'"/> + ng-bind-html="(msg.content.msgtype === 'm.text' && msg.type === 'm.room.message' && msg.content.format === 'org.matrix.custom.html') ? + (msg.content.formatted_body | unsanitizedLinky) : + (msg.content.msgtype === 'm.text' && msg.type === 'm.room.message') ? (msg.content.body | linky:'_blank') : '' "/> <span ng-show='msg.type === "m.call.invite" && msg.user_id == state.user_id'>Outgoing Call{{ isWebRTCSupported ? '' : ' (But your browser does not support VoIP)' }}</span> <span ng-show='msg.type === "m.call.invite" && msg.user_id != state.user_id'>Incoming Call{{ isWebRTCSupported ? '' : ' (But your browser does not support VoIP)' }}</span> |