From e6735f635d9b618c3d58c65481e8c1f1c03f3d76 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 30 Oct 2018 12:02:55 +0100
Subject: [PATCH] W.I.P. migration of mainscreen to et2: - Fix extra space
 added when save the entry - Fix htmlarea not getting a right height when is
 in inactive tab

---
 admin/inc/class.admin_messages.inc.php         |  3 ++-
 admin/templates/default/mainscreen_message.xet |  2 +-
 api/js/etemplate/et2_widget_htmlarea.js        | 13 +++++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/admin/inc/class.admin_messages.inc.php b/admin/inc/class.admin_messages.inc.php
index 4c82d61db6..86b81fa5a1 100644
--- a/admin/inc/class.admin_messages.inc.php
+++ b/admin/inc/class.admin_messages.inc.php
@@ -81,7 +81,8 @@ class admin_messages
 				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);
 	}
 
 	/**
diff --git a/admin/templates/default/mainscreen_message.xet b/admin/templates/default/mainscreen_message.xet
index 00a6b07aa8..019f1aff92 100644
--- a/admin/templates/default/mainscreen_message.xet
+++ b/admin/templates/default/mainscreen_message.xet
@@ -23,7 +23,7 @@
 			</columns>
 			<rows>
 				<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"/>
 				</row>
 				<row>
diff --git a/api/js/etemplate/et2_widget_htmlarea.js b/api/js/etemplate/et2_widget_htmlarea.js
index 8c4bc4193c..8ddf509eaf 100644
--- a/api/js/etemplate/et2_widget_htmlarea.js
+++ b/api/js/etemplate/et2_widget_htmlarea.js
@@ -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);
+			}
+		});
 	},
 
 	/**