From 516015ac4085179aba65f997ce691078b11d7a46 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 13 Sep 2017 18:17:32 +0200 Subject: [PATCH] S/MIME: - Activate smime actions for mobile view - Read and set attachments for mobile view --- mail/js/app.js | 24 ++++++++++++++++++++++-- mail/templates/mobile/compose.xet | 3 +++ mail/templates/mobile/index.xet | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/mail/js/app.js b/mail/js/app.js index e285d8ce21..0cac39f0e3 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -1051,9 +1051,9 @@ app.classes.mail = AppJS.extend( jQuery(IframeHandle.getDOMNode()).on('load', function(e){ self.resolveExternalImages (this.contentWindow.document); }); - if (dataElem.data['smime']) this.smimeAttachmentsCheckerInterval(); - } + } + if (dataElem.data['smime']) this.smimeAttachmentsCheckerInterval(); var messages = {}; messages['msg'] = [_id]; @@ -5777,6 +5777,21 @@ app.classes.mail = AppJS.extend( }, et2_dialog._create_parent('mail')); }, + /** + * set attachments of smime message for mobile view + * @param {type} _attachments + */ + set_smimeAttachmentsMobile: function (_attachments) + { + var attachmentsBlock = this.et2_view.widgetContainer.getWidgetById('attachmentsBlock'); + var $attachment = jQuery('.et2_details.attachments'); + if (attachmentsBlock && _attachments.length > 0) + { + attachmentsBlock.set_value({content:_attachments}); + $attachment.show(); + } + }, + /** * Set attachments of smime message * @@ -5784,6 +5799,11 @@ app.classes.mail = AppJS.extend( */ set_smimeAttachments:function (_attachments) { + if (egwIsMobile()) + { + this.set_smimeAttachmentsMobile(_attachments); + return; + } var attachmentArea = this.et2.getWidgetById(egw(window).is_popup()?'mail_displayattachments':'previewAttachmentArea'); var content = this.et2.getArrayMgr('content'); var mailPreview = this.et2.getWidgetById('mailPreviewContainer'); diff --git a/mail/templates/mobile/compose.xet b/mail/templates/mobile/compose.xet index c59d82681a..d96f66c7cf 100644 --- a/mail/templates/mobile/compose.xet +++ b/mail/templates/mobile/compose.xet @@ -17,6 +17,9 @@ + + + diff --git a/mail/templates/mobile/index.xet b/mail/templates/mobile/index.xet index 11549bcb5f..3b0d6b8f1f 100644 --- a/mail/templates/mobile/index.xet +++ b/mail/templates/mobile/index.xet @@ -28,6 +28,7 @@ +