From 2f52e8ee18126fef4a4a13d27077ca926aed1425 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Wed, 20 Aug 2014 17:17:17 +0200
Subject: [PATCH] BF: Apply image place holder only if the image message has
the height information
---
webclient/room/room.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webclient/room/room.html b/webclient/room/room.html
index 4d7417a80e..db6add4ee7 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -42,7 +42,7 @@
<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="{ 'height' : (msg.content.body.h < 320) ? msg.content.body.h : 320}">
+ 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>
--
GitLab