From 30efb04060c3b7e4ea99e1d03da9690fe7adc5d2 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Wed, 13 Aug 2014 11:09:30 +0200
Subject: Display image messages from the stream

---
 webclient/room/room.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'webclient/room')

diff --git a/webclient/room/room.html b/webclient/room/room.html
index 276c3caa5a..600bc14eb8 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -32,7 +32,8 @@
                 <td ng-class="!msg.content.membership_target ? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : ''">
                     <div class="bubble">
                         {{ 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>
                 </td>
                 <td class="rightBlock">
-- 
cgit 1.4.1