extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-17 18:41:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

W.I.P. migration of mainscreen to et2:

Browse Source 
- Fix extra space added when save the entry
- Fix htmlarea not getting a right height when is in inactive tab
This commit is contained in:
Hadi Nategh
2018-10-30 12:02:55 +01:00
parent c9c14fd4ae
commit e6735f635d
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/js/etemplate/et2_widget_htmlarea.js
View File

@@ -95,7 +95,7 @@ var et2_htmlarea = (function(){ "use strict"; return et2_inputWidget.extend([et2
this._super.apply(this, arguments);
if(this.mode == 'ascii' || this.editor != null) return;
var imageUpload = '';
var self = this;
if (this.options.imageUpload && this.options.imageUpload[0] !== '/' && this.options.imageUpload.substr(0, 4) != 'http')
{
imageUpload = egw.ajaxUrl("EGroupware\\Api\\Etemplate\\Widget\\Vfs::ajax_htmlarea_upload")+
@@ -130,7 +130,7 @@ var et2_htmlarea = (function(){ "use strict"; return et2_inputWidget.extend([et2
images_upload_handler: this.options.images_upload_handler,
init_instance_callback : jQuery.proxy(this._instanceIsReady, this),
plugins: [
"print fullpage searchreplace autolink directionality "+
"print searchreplace autolink directionality "+
"visualblocks visualchars image link media template "+
"codesample table charmap hr pagebreak nonbreaking anchor toc "+
"insertdatetime advlist lists textcolor wordcount imagetools "+
@@ -156,6 +156,15 @@ var et2_htmlarea = (function(){ "use strict"; return et2_inputWidget.extend([et2
// extend default settings with configured options and preferences
jQuery.extend(settings, this._extendedSettings());
this.tinymce = tinymce.init(settings);
// make sure value gets set in case of widget gets loaded by delay like
// inside an inactive tabs
this.tinymce.then(()=> {
self.set_value(self.htmlNode.val());
if (self.editor && self.editor.editorContainer)
{
jQuery(self.editor.editorContainer).height(self.options.height);
}
});
},
/**