BF: Apply image place holder only if the image message has the height information

This commit is contained in:
Emmanuel ROHEE 2014-08-20 17:17:17 +02:00
parent 96da42085c
commit 2f52e8ee18

View File

@ -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.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'"/> <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"' <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 }}"/> <img class="image" ng-src="{{ msg.content.url }}"/>
</div> </div>
</div> </div>