From 4b5faff5d5a7db2e933877bdb4844fb0da358cb0 Mon Sep 17 00:00:00 2001
From: taggon <gonom9@gmail.com>
Date: Mon, 29 Nov 2010 02:32:08 +0000
Subject: [PATCH] =?UTF-8?q?=EB=86=92=EC=9D=B4=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=EA=B0=92=EC=9D=B4=20=EB=B0=98=EC=98=81=EB=90=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8D=98=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7929 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/editor/skins/xeed/js/xe_interface.js | 3 +++
 modules/editor/skins/xeed/js/xeed.js         | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/editor/skins/xeed/js/xe_interface.js b/modules/editor/skins/xeed/js/xe_interface.js
index 4c1b0a486..e9f595088 100644
--- a/modules/editor/skins/xeed/js/xe_interface.js
+++ b/modules/editor/skins/xeed/js/xe_interface.js
@@ -20,6 +20,9 @@ function editorStart_xe(editor_seq, primary_key, content_key, editor_height, col
 	
 	// Use auto save feature?
 	opt.use_autosave = !!$form[0].elements['_saved_doc_title'];
+	
+	// min height
+	if (editor_height) opt.height = parseInt(editor_height) || 200;
 
 	// create an editor
 	xe.Editors[editor_seq] = xeed = new xe.Xeed($textarea, opt);
diff --git a/modules/editor/skins/xeed/js/xeed.js b/modules/editor/skins/xeed/js/xeed.js
index fbeefcd27..3b1036aa7 100644
--- a/modules/editor/skins/xeed/js/xeed.js
+++ b/modules/editor/skins/xeed/js/xeed.js
@@ -43,9 +43,13 @@ Xeed = xe.createApp('Xeed', {
 
 		// Options
 		opts = $.extend({
+			height : 200,
 			minHeight : 400
 		}, options);
 		this._options = opts;
+		
+		// min height
+		if (opts.minHeight > opts.height) opts.minHeight = opts.height;
 
 		//
 		if ($obj.is('textarea')) {
@@ -1729,7 +1733,7 @@ EditMode = xe.createPlugin('EditMode', {
  */
 Resize = xe.createPlugin('Resize', {
 	_fn : null,
-	prev_height : 400,
+	prev_height : 0,
 	$resize_bar : null,
 	$auto_check : null,
 	$container  : null,
@@ -1789,6 +1793,8 @@ Resize = xe.createPlugin('Resize', {
 	},
 	activate : function() {
 		var $root = this.oApp.$root, chk;
+		
+		if (!this.prev_height) this.prev_height = this.oApp.getOption('height');
 
 		this.$container  = this.oApp.$richedit.parent();
 		this.$resize_bar = $root.find('button.resize').mousedown(this._fn.down);