Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 00:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't thumbnail message inline images and show filename in title attribute

Browse source
This commit is contained in:
the-djmaze 2022-10-06 23:43:24 +02:00
parent 13f20cbeb0
commit f488212c3d
5 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dev/Common/Html.js
View file

@ -308,6 +308,7 @@ export const
attachment = findAttachmentByCid(value); attachment = findAttachmentByCid(value);
if (attachment?.download) { if (attachment?.download) {
oElement.src = attachment.linkPreview(); oElement.src = attachment.linkPreview();
oElement.title += ' ('+attachment.fileName+')';
attachment.isInline(true); attachment.isInline(true);
attachment.isLinked(true); attachment.isLinked(true);
} }

12
dev/Model/Attachment.js
View file

@ -133,12 +133,18 @@ export class AttachmentModel extends AbstractModel {
return this.url || serverRequestRaw('View', this.download); return this.url || serverRequestRaw('View', this.download);
} }
/**
* @returns {boolean}
*/
hasThumbnail() {
return this.isThumbnail && !this.isLinked();
}
/** /**
* @returns {string} * @returns {string}
*/ */
linkThumbnailPreviewStyle() { thumbnailStyle() {
// return (this.isThumbnail && !this.isLinked()) return this.hasThumbnail()
return this.isThumbnail
? 'background:url(' + serverRequestRaw('ViewThumbnail', this.download) + ')' ? 'background:url(' + serverRequestRaw('ViewThumbnail', this.download) + ')'
: ''; : '';
} }

5
dev/Styles/User/MessageView.less
View file

@ -318,6 +318,11 @@ html.rl-no-preview-pane {
.attachmentList { .attachmentList {
margin: 0; margin: 0;
/*
min-height: 4em;
max-height: 15vh;
overflow: auto;
*/
} }
&:not(.selection-mode) { &:not(.selection-mode) {

2
snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php
View file

@ -92,7 +92,7 @@ class Attachment implements \JsonSerializable
return \str_replace('/', $sIdx.'.', $sMimeType); return \str_replace('/', $sIdx.'.', $sMimeType);
} }
return ($this->oBodyStructure->IsInline() ? 'part' : 'inline' ) . $sIdx; return ($this->oBodyStructure->IsInline() ? 'inline' : 'part' ) . $sIdx;
} }
public function MimeType() : string public function MimeType() : string

4
snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -236,8 +236,8 @@
<i class="hidePreview iconMain" data-bind="css: iconClass()"></i> <i class="hidePreview iconMain" data-bind="css: iconClass()"></i>
<div class="showPreview"> <div class="showPreview">
<a data-bind="css: {'attachmentImagePreview': isImage()}, attr: { 'title': fileName, 'href': linkPreviewMain() }" target="_blank"> <a data-bind="css: {'attachmentImagePreview': isImage()}, attr: { 'title': fileName, 'href': linkPreviewMain() }" target="_blank">
<i class="iconMain" data-bind="visible: !isThumbnail, css: iconClass()"></i> <i class="iconMain" data-bind="visible: !hasThumbnail(), css: iconClass()"></i>
<div class="iconBG" data-bind="attr: { 'style': linkThumbnailPreviewStyle() }"></div> <div class="iconBG" data-bind="attr: { 'style': thumbnailStyle() }"></div>
<div class="iconPreview fontastic">👁</div> <div class="iconPreview fontastic">👁</div>
</a> </a>
</div> </div>