extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mail compose resize does not work always

Browse Source
This commit is contained in:
Hadi Nategh 2015-09-23 10:51:27 +00:00
parent 9e9cbc2fa1
commit 773fbf7eea
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mail/js/app.js
View File

@ -225,6 +225,7 @@ app.classes.mail = AppJS.extend(
// use a wrapper on a different url to be able to use a different fpm pool // use a wrapper on a different url to be able to use a different fpm pool
et2.menuaction = 'mail_compose::ajax_send'; et2.menuaction = 'mail_compose::ajax_send';
var that = this; var that = this;
var textAreaWidget = this.et2.getWidgetById('mail_htmltext');
this.mail_isMainWindow = false; this.mail_isMainWindow = false;
this.compose_fieldExpander_init(); this.compose_fieldExpander_init();
this.check_sharing_filemode(); this.check_sharing_filemode();
@ -245,9 +246,14 @@ 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(){ if (textAreaWidget && typeof textAreaWidget.ckeditor != 'undefined')
that.compose_fieldExpander(); {
}, 300); textAreaWidget.ckeditor.on('instanceReady', function(){that.compose_fieldExpander();});
}
else
{
this.compose_fieldExpander();
}
}); });
//Resize compose after window resize to not getting scrollbar //Resize compose after window resize to not getting scrollbar
@ -274,7 +280,7 @@ app.classes.mail = AppJS.extend(
} }
else else
{ {
this.et2.getWidgetById('mail_htmltext').ckeditor.on('instanceReady', function(e) { textAreaWidget.ckeditor.on('instanceReady', function(e) {
this.focus(); this.focus();
}); });
} }