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

Show some attachment files in progress on visible bottom part of compose dialog

Browse Source
This commit is contained in:
Hadi Nategh 2014-12-19 08:43:01 +00:00
parent 1ab93cf856
commit 6670964d01
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mail/js/app.js
View File

@ -3102,7 +3102,8 @@ app.classes.mail = AppJS.extend(
if (groupbox) groupbox.set_disabled(false);
}
//Resize the compose dialog
this.compose_resizeHandler();
var self = this;
setTimeout(function(){self.compose_resizeHandler();}, 100);
return true;
},
@ -3676,8 +3677,18 @@ app.classes.mail = AppJS.extend(
{
var bodyH = egw_getWindowInnerHeight();
var textArea = this.et2.getWidgetById('mail_plaintext');
var headerSec = jQuery('.mailComposeHeaderSection');
var $headerSec = jQuery('.mailComposeHeaderSection');
var attachments = this.et2.getWidgetById('attachments');
var content = this.et2.getArrayMgr('content').data;
// @var arrbitary int represents px
// Visible height of attachment progress
var prgV_H = 150;
// @var arrbitary int represents px
// Visible height of attchements list
var attchV_H = 68;
if (typeof textArea != 'undefined' && textArea != null)
{
if (textArea.getParent().disabled)
@ -3686,9 +3697,12 @@ app.classes.mail = AppJS.extend(
}
// Tolerate values base on plain text or html, in order to calculate freespaces
var textAreaDelta = textArea.id == "mail_htmltext"?20:40;
var delta = content.attachments? 68: textAreaDelta;
var bodySize = (bodyH - Math.round(headerSec.height() + headerSec.offset().top) - delta);
// while attachments are in progress take progress visiblity into account
// otherwise the attachment progress is finished and consider attachments list
var delta = (attachments.table.find('li').length>0 && attachments.table.height() > 0)? prgV_H: (content.attachments? attchV_H: textAreaDelta);
var bodySize = (bodyH - Math.round($headerSec.height() + $headerSec.offset().top) - delta);
if (textArea.id != "mail_htmltext")
{