Fix mailvelope display print with multipage content

This commit is contained in:
Hadi Nategh 2015-06-02 15:26:51 +00:00
parent 27e7c49e30
commit 3908b46079
3 changed files with 11 additions and 8 deletions

View File

@ -4393,12 +4393,17 @@ app.classes.mail = AppJS.extend(
{ {
var tempPrint = jQuery('div#tempPrintDiv'); var tempPrint = jQuery('div#tempPrintDiv');
var mailvelopeTopContainer = jQuery('div.mailDisplayContainer'); var mailvelopeTopContainer = jQuery('div.mailDisplayContainer');
var originFrame = jQuery('#mail-display_mailDisplayBodySrc');
var iframe = jQuery(this.mailvelope_iframe_selector); var iframe = jQuery(this.mailvelope_iframe_selector);
if (tempPrint.length >0) if (tempPrint.length >0)
{ {
// Mailvelope iframe height is approximately equal to the height of encrypted origin message
// we add an arbitary plus pixels to make sure it's covering the full content in print view and
// it is not getting acrollbar in normal view
// @TODO: after Mailvelope plugin provides a hieght value, we can replace the height with an accurate value
iframe.addClass('mailvelopeIframe').height(originFrame[0].contentWindow.document.body.scrollHeight + 400);
tempPrint.hide(); tempPrint.hide();
iframe.addClass('mailvelopeIframe');
mailvelopeTopContainer.addClass('mailvelopeTopContainer'); mailvelopeTopContainer.addClass('mailvelopeTopContainer');
} }
}, },

View File

@ -803,12 +803,11 @@ blockquote blockquote blockquote blockquote blockquote blockquote{
padding-top: 10px; padding-top: 10px;
} }
div.mailDisplayContainer.mailvelopeTopContainer { div.mailDisplayContainer.mailvelopeTopContainer {
position:fixed !important;
top:190px; top:190px;
} }
div.mailDisplayContainer.mailvelopeTopContainer > iframe { div.mailDisplayContainer.mailvelopeTopContainer > iframe {
position: inherit; position: static;
min-width: 860px; min-width: 860px;
} }
} }

View File

@ -800,12 +800,11 @@ blockquote blockquote blockquote blockquote blockquote blockquote {
padding-top: 10px; padding-top: 10px;
} }
div.mailDisplayContainer.mailvelopeTopContainer { div.mailDisplayContainer.mailvelopeTopContainer {
position:fixed !important; top:190px;
top:190px;
} }
div.mailDisplayContainer.mailvelopeTopContainer > iframe { div.mailDisplayContainer.mailvelopeTopContainer > iframe {
position: inherit; position: static;
min-width: 860px; min-width: 860px;
} }
} }
/* MOBILE and tablets (Portrait & Landscape) View --------------*/ /* MOBILE and tablets (Portrait & Landscape) View --------------*/