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

Fix mail compose resize handler, and make sure that is happening after popup window resize

Browse Source
This commit is contained in:
Hadi Nategh 2014-11-10 12:03:49 +00:00
parent 4d5149ae23
commit 2ebad86634
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mail/js/app.js
View File

@ -206,7 +206,7 @@ app.classes.mail = AppJS.extend(
}); });
/*Trigger compose_resizeHandler after the CKEditor is fully loaded*/ /*Trigger compose_resizeHandler after the CKEditor is fully loaded*/
jQuery('#mail-compose').on ('load',function() { jQuery('#mail-compose').on ('load',function() {
window.setTimeout(function(){that.compose_resizeHandler();}, 100); window.setTimeout(function(){that.compose_resizeHandler();}, 300);
}); });
this.compose_fieldExpander(); this.compose_fieldExpander();
@ -3664,10 +3664,10 @@ app.classes.mail = AppJS.extend(
*/ */
compose_resizeHandler: function() compose_resizeHandler: function()
{ {
var bodyH = jQuery('body').height(); var bodyH = egw_getWindowInnerHeight();
var textArea = this.et2.getWidgetById('mail_plaintext'); var textArea = this.et2.getWidgetById('mail_plaintext');
var toolbar = jQuery('.mailSignature'); var toolbar = jQuery('.mailSignature');
var content = this.et2.getArrayMgr('content').data;
if (typeof textArea != 'undefined' && textArea != null) if (typeof textArea != 'undefined' && textArea != null)
{ {
var textAreaH = textArea.node.clientHeight; var textAreaH = textArea.node.clientHeight;
@ -3676,8 +3676,11 @@ app.classes.mail = AppJS.extend(
textArea = this.et2.getWidgetById('mail_htmltext'); textArea = this.et2.getWidgetById('mail_htmltext');
textAreaH = parseInt(textArea.getParent().node.clientHeight); textAreaH = parseInt(textArea.getParent().node.clientHeight);
} }
// Tolerate values base on plain text or html, in order to calculate freespaces
var freeSpace = (bodyH - Math.round(toolbar.height() + toolbar.offset().top) - 65); var textAreaDelta = textArea.id == "mail_htmltext"?20:40;
var delta = content.attachments? 68: textAreaDelta;
var freeSpace = (bodyH - Math.round(toolbar.height() + toolbar.offset().top) - delta);
if (textArea.id != "mail_htmltext") if (textArea.id != "mail_htmltext")
{ {