Skip to content
Snippets Groups Projects
Commit 30efb040 authored by Emmanuel ROHEE's avatar Emmanuel ROHEE
Browse files

Display image messages from the stream

parent 3e35a9f9
Branches
Tags
No related merge requests found
...@@ -187,6 +187,14 @@ h1 { ...@@ -187,6 +187,14 @@ h1 {
border: 0px ! important; border: 0px ! important;
} }
.image {
display: block;
max-width:320px;
max-height:320px;
width: auto;
height: auto;
}
.bubble { .bubble {
padding: 6px; padding: 6px;
padding-left: 1em; padding-left: 1em;
......
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
<td ng-class="!msg.content.membership_target ? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : ''"> <td ng-class="!msg.content.membership_target ? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : ''">
<div class="bubble"> <div class="bubble">
{{ msg.content.msgtype === "m.emote" ? ("* " + (members[msg.user_id].displayname || msg.user_id) + " ") : "" }} {{ msg.content.msgtype === "m.emote" ? ("* " + (members[msg.user_id].displayname || msg.user_id) + " ") : "" }}
{{ msg.content.body }} {{ msg.content.msgtype === "m.text" ? msg.content.body : "" }}
<img class="image" ng-hide='msg.content.msgtype !== "m.image"' src="{{ msg.content.url }}" alt="{{ msg.content.body }}"/>
</div> </div>
</td> </td>
<td class="rightBlock"> <td class="rightBlock">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment