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

Make sure the content of CKeidtor is ready before resize and check for none participant to resize

Browse Source
This commit is contained in:
Hadi Nategh 2015-04-30 08:07:23 +00:00
parent 1ae125f08e
commit 15f18e20b5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etemplate/js/et2_widget_htmlarea.js
View File

@ -263,7 +263,7 @@ var et2_htmlarea = et2_inputWidget.extend([et2_IResizeable],
*/ */
resize: function (_height) resize: function (_height)
{ {
if (_height) if (_height && this.options.resize_ratio !== '0')
{ {
// apply the ratio // apply the ratio
_height = (this.options.resize_ratio != '')? _height * this.options.resize_ratio: _height; _height = (this.options.resize_ratio != '')? _height * this.options.resize_ratio: _height;
@ -272,14 +272,20 @@ var et2_htmlarea = et2_inputWidget.extend([et2_IResizeable],
if (this.ckeditor) // CKEDITOR HTML if (this.ckeditor) // CKEDITOR HTML
{ {
var h = 0; var h = 0;
if (typeof this.ckeditor.container.$ != 'undefined' && this.ckeditor.container.$.clientHeight > 0) if (typeof this.ckeditor.container !='undefined' && this.ckeditor.container.$.clientHeight > 0)
{ h = (this.ckeditor.container.$.clientHeight + _height) > 0 ? {
h = (this.ckeditor.container.$.clientHeight + _height) > 0 ?
this.ckeditor.container.$.clientHeight + _height: this.ckeditor.config.height; this.ckeditor.container.$.clientHeight + _height: this.ckeditor.config.height;
} }
else else if (this.ckeditor.ui.space('contents'))
{ {
h = parseInt(this.ckeditor.ui.space('contents').getStyle('height')) + _height; h = parseInt(this.ckeditor.ui.space('contents').getStyle('height')) + _height;
} }
else // fallback height size
{
h = this.ckeditor.config.height + _height;
}
this.ckeditor.resize(0,h); this.ckeditor.resize(0,h);
} }
else // No CKEDITOR else // No CKEDITOR