summary refs log tree commit diff
path: root/webclient/room/room.html
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-20 17:17:17 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-20 17:17:17 +0200
commit2f52e8ee18126fef4a4a13d27077ca926aed1425 (patch)
treea82ecb6653ebe2bee75a17626089353a6b628b56 /webclient/room/room.html
parentBF: Wait for the room_id being resolved before starting pagination (diff)
downloadsynapse-2f52e8ee18126fef4a4a13d27077ca926aed1425.tar.xz
BF: Apply image place holder only if the image message has the height information
Diffstat (limited to 'webclient/room/room.html')
-rw-r--r--webclient/room/room.html2
1 files changed, 1 insertions, 1 deletions
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>