From 1900af2a7ea67f53fa6196688af0119ab6eb82b4 Mon Sep 17 00:00:00 2001
From: ChanMyeong <dece24@gmail.com>
Date: Tue, 6 Mar 2012 02:48:10 +0000
Subject: [PATCH] issue 1606 fixed. 	WYSIWYG Editor textarea word-break,
 word-wrap.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10330 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/editor/lang/lang.xml                      | 6 +++---
 modules/editor/skins/xpresseditor/css/default.css | 2 +-
 modules/editor/styles/default/editor.css          | 2 +-
 modules/editor/styles/dreditor/editor.css         | 2 +-
 modules/editor/styles/xeStyle/editor.css          | 2 +-
 modules/editor/styles/xeStyleBlack/editor.css     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/editor/lang/lang.xml b/modules/editor/lang/lang.xml
index 1e87fb71f..6c8cb506f 100644
--- a/modules/editor/lang/lang.xml
+++ b/modules/editor/lang/lang.xml
@@ -1449,14 +1449,14 @@ Bài viết tự động lưu sẽ tự động hủy sau khi bạn hoàn thành
 			<value xml:lang="vi"><![CDATA[Phím nóng]]></value>
 		</item>
 		<item name="lineheight">
-			<value xml:lang="ko"><![CDATA[줄 간격]]></value>
+			<value xml:lang="ko"><![CDATA[줄간격]]></value>
 			<value xml:lang="en"><![CDATA[Line Height]]></value>
 			<value xml:lang="jp"><![CDATA[行間]]></value>
 			<value xml:lang="zh-CN"><![CDATA[行间距]]></value>
 			<value xml:lang="zh-TW"><![CDATA[行距]]></value>
-			<value xml:lang="fr"><![CDATA[줄간격]]></value>
+			<value xml:lang="fr"><![CDATA[Line Height]]></value>
 			<value xml:lang="ru"><![CDATA[Высота строки]]></value>
-			<value xml:lang="es"><![CDATA[줄간격]]></value>
+			<value xml:lang="es"><![CDATA[Line Height]]></value>
 			<value xml:lang="tr"><![CDATA[Satır Yüksekliği]]></value>
 			<value xml:lang="vi"><![CDATA[Chiều cao dòng]]></value>
 		</item>
diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css
index 29d8e5543..dac11f5ea 100644
--- a/modules/editor/skins/xpresseditor/css/default.css
+++ b/modules/editor/skins/xpresseditor/css/default.css
@@ -77,7 +77,7 @@
 .xpress-editor .tool li.html span button,
 .xpress-editor .tool li.preview span button{left:2px;height:21px;background-position:right top;font:11px/21px Tahoma, Sans-serif;padding:0 4px;*overflow:visible;*line-height:20px}
 .xpress-editor .tool ul.type li{float:none;display:inline;*top:1px}
-.xpress-editor .tool ul.type li select{height:21px;width:62px}
+.xpress-editor .tool ul.type li select{height:21px;width:62px;white-space:nowrap}
 .xpress-editor.black .tool ul.type li select{color:#fff;background-color:#000}
 /* Content > Tool > Button Default */
 .xpress-editor .tool li.undo button{width:22px;background-position:0 0}
diff --git a/modules/editor/styles/default/editor.css b/modules/editor/styles/default/editor.css
index 97dd8c180..cca1a001d 100644
--- a/modules/editor/styles/default/editor.css
+++ b/modules/editor/styles/default/editor.css
@@ -2,7 +2,7 @@
 html,body{height:100%}
 body{margin:0;padding:0}
 /* NHN (developers@xpressengine.com) */
-.xe_content{color:#000;font-size:12px;line-height:1.5}
+.xe_content{color:#000;font-size:12px;line-height:1.5;word-break:break-all;word-wrap:break-word}
 .xe_content blockquote.q1,
 .xe_content blockquote.q2,
 .xe_content blockquote.q3,
diff --git a/modules/editor/styles/dreditor/editor.css b/modules/editor/styles/dreditor/editor.css
index 93b158871..a4979f436 100644
--- a/modules/editor/styles/dreditor/editor.css
+++ b/modules/editor/styles/dreditor/editor.css
@@ -1,7 +1,7 @@
 @charset "utf-8";
 /* NHN (developers@xpressengine.com) */
 html, body{height:100%;background-color:transparent;padding:0;margin:0}
-.xe_content{color:#000;font-size:12px;line-height:1.5}
+.xe_content{color:#000;font-size:12px;line-height:1.5;word-break:break-all;word-wrap:break-word}
 .xe_content blockquote.q1,
 .xe_content blockquote.q2,
 .xe_content blockquote.q3,
diff --git a/modules/editor/styles/xeStyle/editor.css b/modules/editor/styles/xeStyle/editor.css
index d2c9df3d5..bd6faccb7 100755
--- a/modules/editor/styles/xeStyle/editor.css
+++ b/modules/editor/styles/xeStyle/editor.css
@@ -1,7 +1,7 @@
 @charset "utf-8";
 /* NHN (developers@xpressengine.com) */
 html, body{height:100%;background-color:transparent;padding:0;margin:0}
-.xe_content.editable {margin-right:8px}
+.xe_content.editable {margin-right:8px;word-break:break-all;word-wrap:break-word}
 .xe_content.editable h1,
 .xe_content.editable h2,
 .xe_content.editable h3,
diff --git a/modules/editor/styles/xeStyleBlack/editor.css b/modules/editor/styles/xeStyleBlack/editor.css
index 645d8435d..bb0253bce 100644
--- a/modules/editor/styles/xeStyleBlack/editor.css
+++ b/modules/editor/styles/xeStyleBlack/editor.css
@@ -1,7 +1,7 @@
 @charset "utf-8";
 /* NHN (developers@xpressengine.com) */
 html, body{height:100%;background-color:transparent;padding:0;margin:0}
-.xe_content.editable{margin-right:8px}
+.xe_content.editable{margin-right:8px;word-break:break-all;word-wrap:break-word}
 .xe_content.editable h1,
 .xe_content.editable h2,
 .xe_content.editable h3,