extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues 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-09 08:56:45 +00:00
parent 8548f08947
commit 7116ae34a8
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

@ -3096,7 +3096,8 @@ app.classes.mail = AppJS.extend(
if (groupbox) groupbox.set_disabled(false); if (groupbox) groupbox.set_disabled(false);
} }
//Resize the compose dialog //Resize the compose dialog
this.compose_resizeHandler(); var self = this;
setTimeout(function(){self.compose_resizeHandler();}, 100);
return true; return true;
}, },
@ -3670,8 +3671,18 @@ app.classes.mail = AppJS.extend(
{ {
var bodyH = egw_getWindowInnerHeight(); var bodyH = egw_getWindowInnerHeight();
var textArea = this.et2.getWidgetById('mail_plaintext'); 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 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 (typeof textArea != 'undefined' && textArea != null)
{ {
if (textArea.getParent().disabled) if (textArea.getParent().disabled)
@ -3680,9 +3691,12 @@ app.classes.mail = AppJS.extend(
} }
// Tolerate values base on plain text or html, in order to calculate freespaces // Tolerate values base on plain text or html, in order to calculate freespaces
var textAreaDelta = textArea.id == "mail_htmltext"?20:40; var textAreaDelta = textArea.id == "mail_htmltext"?20:40;
var delta = content.attachments? 68: textAreaDelta;
// while attachments are in progress take progress visiblity into account
var bodySize = (bodyH - Math.round(headerSec.height() + headerSec.offset().top) - delta); // 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") if (textArea.id != "mail_htmltext")
{ {