extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/inc/class.admin_messages.inc.php
View File

@ -81,7 +81,8 @@ class admin_messages
self::LOGINSCREEN => !$acls[self::LOGINSCREEN] self::LOGINSCREEN => !$acls[self::LOGINSCREEN]
) )
); );
$tpl->exec('admin.admin_messages.index', $content, array(), $readonlys);
$tpl->exec('admin.admin_messages.index', $content, array('lang' => Api\Translation::get_installed_langs()), $readonlys);
} }
/** /**

2
admin/templates/default/mainscreen_message.xet
View File

@ -23,7 +23,7 @@
</columns> </columns>
<rows> <rows>
<row> <row>
<select-lang id="lang" onchange="widget.getInstanceManager().submit()"/> <select id="lang" onchange="widget.getInstanceManager().submit()"/>
<checkbox id="html" onchange="widget.getInstanceManager().submit()" label="html/plaintext"/> <checkbox id="html" onchange="widget.getInstanceManager().submit()" label="html/plaintext"/>
</row> </row>
<row> <row>

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); this._super.apply(this, arguments);
if(this.mode == 'ascii' || this.editor != null) return; if(this.mode == 'ascii' || this.editor != null) return;
var imageUpload = ''; var imageUpload = '';
var self = this;
if (this.options.imageUpload && this.options.imageUpload[0] !== '/' && this.options.imageUpload.substr(0, 4) != 'http') 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")+ 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, images_upload_handler: this.options.images_upload_handler,
init_instance_callback : jQuery.proxy(this._instanceIsReady, this), init_instance_callback : jQuery.proxy(this._instanceIsReady, this),
plugins: [ plugins: [
"print fullpage searchreplace autolink directionality "+ "print searchreplace autolink directionality "+
"visualblocks visualchars image link media template "+ "visualblocks visualchars image link media template "+
"codesample table charmap hr pagebreak nonbreaking anchor toc "+ "codesample table charmap hr pagebreak nonbreaking anchor toc "+
"insertdatetime advlist lists textcolor wordcount imagetools "+ "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 // extend default settings with configured options and preferences
jQuery.extend(settings, this._extendedSettings()); jQuery.extend(settings, this._extendedSettings());
this.tinymce = tinymce.init(settings); 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);
}
});
}, },
/** /**