holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix re-positioning mail preview content according to its visible sibilings

Browse Source
This commit is contained in:
Hadi Nategh 2014-10-31 10:50:30 +00:00
parent 9193bdfc36
commit 788bc9ff3e
3 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mail/js/app.js
View File

@ -758,31 +758,37 @@ app.classes.mail = AppJS.extend(
//dataElem.data is populated, when available with fromaddress(string),toaddress(string),additionaltoaddress(array),ccaddress (array) //dataElem.data is populated, when available with fromaddress(string),toaddress(string),additionaltoaddress(array),ccaddress (array)
var dataElem = {data:{subject:"",fromaddress:"",toaddress:"",ccaddress:"",date:"",attachmentsBlock:""}}; var dataElem = {data:{subject:"",fromaddress:"",toaddress:"",ccaddress:"",date:"",attachmentsBlock:""}};
var attachmentArea = this.et2.getWidgetById('previewAttachmentArea'); var attachmentArea = this.et2.getWidgetById('previewAttachmentArea');
var previewContainer = this.et2.getWidgetById('mailPreviewContainer');
if(typeof selected != 'undefined' && selected.length == 1) if(typeof selected != 'undefined' && selected.length == 1)
{ {
var _id = this.mail_fetchCurrentlyFocussed(selected); var _id = this.mail_fetchCurrentlyFocussed(selected);
dataElem = jQuery.extend(dataElem, egw.dataGetUIDdata(_id)); dataElem = jQuery.extend(dataElem, egw.dataGetUIDdata(_id));
} }
var $preview_iframe = jQuery('#mail-index_mailPreviewContainer');
// Re calculate the position of preview iframe according to its visible sibilings
var set_prev_iframe_top = function ()
{
// Need to make sure that the iframe is fullyLoad before calculation
window.setTimeout(function(){
var lastEl = $preview_iframe.prev().prev();
// Top offset of preview iframe calculated from top level
var iframeTop = $preview_iframe.offset().top;
while (lastEl.css('display') === "none")
{
lastEl = lastEl.prev();
}
var offset = iframeTop - (lastEl.offset().top + lastEl.height()) || 130; // fallback to 130 px if can not calculate new top
// preview iframe parent has position absolute, therefore need to calculate the top via position
$preview_iframe.css ('top', $preview_iframe.position().top - offset + 10);
}, 50);
}
if (attachmentArea && typeof _id != 'undefined' && _id !='' && typeof dataElem !== 'undefined') if (attachmentArea && typeof _id != 'undefined' && _id !='' && typeof dataElem !== 'undefined')
{ {
this.et2.getWidgetById('previewAttachmentArea').set_class('previewAttachmentArea'); // If there is content to show recalculate the size
if (!dataElem.data.attachmentsBlock) set_prev_iframe_top();
{
if (!dataElem.data.ccaddress)
{
previewContainer.set_class('previewNoAttachment');
}
else
{
previewContainer.set_class('previewNoAttachmentButCC');
}
}
else
{
jQuery(previewContainer.node).removeClass('previewNoAttachment previewNoAttachmentButCC');
}
} }
else else
{ {

6
mail/templates/default/app.css
View File

@ -502,12 +502,6 @@ div.mail-compose_fileselector {
left: 3px; left: 3px;
right: 0; right: 0;
} }
#mail-index_mailPreviewContainer.previewNoAttachment {
top: 51px;
}
#mail-index_mailPreviewContainer.previewNoAttachmentButCC{
top: 67px;
}
#mail-index_previewAttachmentArea { #mail-index_previewAttachmentArea {
background-color:#f0f0f0; background-color:#f0f0f0;
max-height: 1.6em; max-height: 1.6em;

6
mail/templates/pixelegg/app.css
View File

@ -502,12 +502,6 @@ div.mail-compose_fileselector {
left: 3px; left: 3px;
right: 0; right: 0;
} }
#mail-index_mailPreviewContainer.previewNoAttachment {
top: 51px;
}
#mail-index_mailPreviewContainer.previewNoAttachmentButCC {
top: 67px;
}
#mail-index_previewAttachmentArea { #mail-index_previewAttachmentArea {
background-color: #f0f0f0; background-color: #f0f0f0;
max-height: 1.6em; max-height: 1.6em;