moparisthebest
/
mail
mirror of https://github.com/moparisthebest/mail
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #117 from whiteout-io/dev/WO-585 

[WO-585] Fix bug: Show content if only html is present
This commit is contained in:
Tankred Hase 2014-09-12 15:11:33 +02:00
parent 292bd3cb77 a2bc734ba6
commit d5d74df9bf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tpl/read.html
View File

@ -54,7 +54,7 @@
</div><!--/.working-wrapper-->
<div class="signature-status"
ng-show="state.mailList.selected.body && state.mailList.selected.signed && !state.mailList.selected.signaturesValid">
ng-show="(state.mailList.selected.body || state.mailList.selected.html) && state.mailList.selected.signed && !state.mailList.selected.signaturesValid">
<p>Invalid PGP signature. This message could have been tampered with.</p>
</div>
@ -64,7 +64,7 @@
<!-- Render html body in sandboxed iframe -->
<div class="frame-wrapper"
ng-show="state.mailList.selected && (!state.mailList.selected.encrypted && state.mailList.selected.body) || (state.mailList.selected.encrypted && state.mailList.selected.decrypted)">
ng-show="state.mailList.selected && (!state.mailList.selected.encrypted && (state.mailList.selected.body || state.mailList.selected.html)) || (state.mailList.selected.encrypted && state.mailList.selected.decrypted)">
<iframe sandbox="allow-popups allow-scripts" src="tpl/read-sandbox.html"
frame-load>
</iframe>