diff options
author | Matthew Hodgson <matthew@matrix.org> | 2014-11-13 11:58:54 +0200 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2014-11-13 11:58:54 +0200 |
commit | 28408a9f64dc889078711b0e2bae5cff4c90c91e (patch) | |
tree | 35ea17e51de82925f171bb15d4b9876d67b3bf9c /syweb/webclient/room/room.html | |
parent | various fixes based on truphone feedback (diff) | |
parent | Detect OpenWebRTC and add workarounds, but comment out the turn server remova... (diff) | |
download | synapse-28408a9f64dc889078711b0e2bae5cff4c90c91e.tar.xz |
Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into develop
Diffstat (limited to 'syweb/webclient/room/room.html')
-rw-r--r-- | syweb/webclient/room/room.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/syweb/webclient/room/room.html b/syweb/webclient/room/room.html index 1f1cd9baef..b97b839b41 100644 --- a/syweb/webclient/room/room.html +++ b/syweb/webclient/room/room.html @@ -203,7 +203,7 @@ <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-class="containsBingWord(msg) && msg.user_id != state.user_id ? msg.echo_msg_state + ' messageBing' : msg.echo_msg_state" 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') : '' "/> |