From e4f0e1af1aa075e6d86921d46e824d85855c1def Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Thu, 21 Aug 2014 14:58:26 +0200
Subject: [PATCH] If there are available, show image thumbnails in the messages
list
---
webclient/room/room.html | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/webclient/room/room.html b/webclient/room/room.html
index db6add4ee7..5dcc8caa1e 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -41,9 +41,13 @@
<div class="bubble">
<span ng-hide='msg.content.msgtype !== "m.emote"' ng-bind-html="'* ' + (members[msg.user_id].displayname || msg.user_id) + ' ' + msg.content.body | linky:'_blank'"/>
<span ng-hide='msg.content.msgtype !== "m.text"' ng-bind-html="((msg.content.msgtype === 'm.text') ? msg.content.body : '') | linky:'_blank'"/>
- <div ng-hide='msg.content.msgtype !== "m.image"'
- ng-style="msg.content.body.h && { 'height' : (msg.content.body.h < 320) ? msg.content.body.h : 320}">
- <img class="image" ng-src="{{ msg.content.url }}"/>
+ <div ng-show='msg.content.msgtype === "m.image"'>
+ <div ng-hide='msg.content.thumbnail_url' ng-style="msg.content.body.h && { 'height' : (msg.content.body.h < 320) ? msg.content.body.h : 320}">
+ <img class="image" ng-src="{{ msg.content.url }}"/>
+ </div>
+ <div ng-show='msg.content.thumbnail_url' ng-style="{ 'height' : msg.content.thumbnail_info.h }">
+ <img class="image" ng-src="{{ msg.content.thumbnail_url }}"/>
+ </div>
</div>
</div>
</td>
--
GitLab