From 6a9c82284de242563c9b752363f80b5b304cef7f Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 5 Jul 2017 12:21:52 +0900
Subject: [PATCH] Fix #865 set height of CKEditor container more intelligently

---
 modules/editor/skins/ckeditor/editor.html | 4 +++-
 modules/editor/tpl/js/editor.app.js       | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
index 246759b7e..d175d156b 100644
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@@ -36,7 +36,9 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
 <input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
 <!--@end-->
 
-<div id="ckeditor_instance_{$editor_sequence}" data-editor-sequence="{$editor_sequence}" data-editor-primary-key-name="{$editor_primary_key_name}" data-editor-content-key-name="{$editor_content_key_name}" style="min-height:{$editor_height}px;"></div>
+{@ $editor_height_fixed = $editor_height + ($editor_toolbar_hide ? 58 : ($editor_toolbar === 'simple' ? 74 : 140))}
+
+<div id="ckeditor_instance_{$editor_sequence}" data-editor-sequence="{$editor_sequence}" data-editor-primary-key-name="{$editor_primary_key_name}" data-editor-content-key-name="{$editor_content_key_name}" style="min-height:{$editor_height_fixed}px;"></div>
 
 <p cond="$enable_autosave" class="editor_autosaved_message autosave_message" id="editor_autosaved_message_{$editor_sequence}">&nbsp;</p>
 
diff --git a/modules/editor/tpl/js/editor.app.js b/modules/editor/tpl/js/editor.app.js
index 88356fbe3..8e4fcaf87 100644
--- a/modules/editor/tpl/js/editor.app.js
+++ b/modules/editor/tpl/js/editor.app.js
@@ -143,6 +143,10 @@ function getAutoSavedSrl(ret_obj, response_tags, c) {
 				if(!opts.enableToolbar) instance.config.toolbar = [];
 			});
 
+			instance.on('instanceReady', function(e) {
+				$containerEl.css("min-height", 0);
+			});
+
 			instance.on('paste', function(e) {
 				if (e.data && e.data.dataValue && e.data.dataValue.replace) {
 					e.data.dataValue = e.data.dataValue.replace(/&lt;(iframe|object)\s[^<>]+&lt;\/\1&gt;/g, function(m) {