Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for org.matrix.custom.text.html 

This format will remain undocumented as it is not yet suitable for
introduction into the specification.
This commit is contained in:
Kegan Dougal 2014-10-15 09:32:02 +01:00
parent 13b560971e
commit f4667f86af
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webclient/components/matrix/event-handler-service.js
View File

@ -460,6 +460,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
handleRoomAliases(event, isLiveEvent);
break;
case "m.room.message":
case "org.matrix.custom.text.html":
handleMessage(event, isLiveEvent);
break;
case "m.room.member":

3
webclient/room/room.html
View File

@ -121,7 +121,8 @@
<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.body | linky:'_blank') :
(msg.content.msgtype === 'm.text' && msg.type === 'org.matrix.custom.text.html') ? msg.content.body : '' "/>
<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>