From d15a45faa5e981d1f8d60f1db2f9fc57d746bf4f Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 20 Mar 2007 09:29:42 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@575
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 classes/context/Context.class.php | 2 +-
 modules/editor/tpl/editor.html    | 7 +------
 modules/editor/tpl/js/editor.js   | 4 ++++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 9ce272cb8..a37fc42e4 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -678,7 +678,7 @@
             $content = preg_replace_callback('!<(div|img)([^\>]*)editor_component=([^\>]*?)>!is', array($this,'_transEditorComponent'), $content);
 
             // <br> 코드 변환
-            $content = preg_replace('/<br([^>]*)>/i','<br$1/>', $content);
+            $content = preg_replace('/<br([^>\/]*)(\/>|>)/i','<br$1 />', $content);
 
             // <img ...> 코드를 <img ... /> 코드로 변환
             $content = preg_replace('/<img([^>^\/]*)(\/>|>)/i','<img$1 />', $content);
diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html
index eb2bce5f5..642b40380 100644
--- a/modules/editor/tpl/editor.html
+++ b/modules/editor/tpl/editor.html
@@ -49,7 +49,7 @@
     </div>
 
     <!-- 에디팅 관련 문단 기능 (IE에서는 사용자 선택시 나타남) -->
-    <div id="editor_paragraph_{$upload_target_srl}" class="editor_iconbox" style="display:none">
+    <div id="editor_paragraph_{$upload_target_srl}" class="editor_iconbox">
       <img src="./images/align_left.gif" alt="{$lang->edit->help_align_left}" id="component_{$upload_target_srl}_justifyleft" />
       <img src="./images/align_center.gif" alt="{$lang->edit->help_align_center}" id="component_{$upload_target_srl}_justifycenter" />
       <img src="./images/align_right.gif" alt="{$lang->edit->help_align_right}" id="component_{$upload_target_srl}_justifyright" />
@@ -59,11 +59,6 @@
       <img src="./images/list_bullet.gif" alt="list bullet" id="component_{$upload_target_srl}_insertunorderedlist" />
     </div>
 
-    <!-- IE의 경우 엔터시 p 태그를 쓸지 br 태그로 변경을 할지 체크하는 항목 -->
-    <div class="editor_parabox" id="editor_use_paragraph_box_{$upload_target_srl}">
-      <input type="checkbox" name="use_paragraph" id="editor_use_paragraph_{$upload_target_srl}" onclick="editorUseParagraph(this,'{$upload_target_srl}');" />
-      <label for="editor_use_paragraph_{$upload_target_srl}">{$lang->edit->use_paragraph}</label>
-    </div>
   </div>
 
   <div class="editor_area_2">
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index 618c53062..6301f2f41 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -78,6 +78,7 @@ function editorStart(upload_target_srl) {
     xAddEventListener(document,'mousedown',editorHideObject);
 
     // 문단작성기능 on/off
+    /*
     if(xIE4Up) {
         xDisplay('editor_paragraph_'+upload_target_srl, 'none');
         xDisplay('editor_use_paragraph_box_'+upload_target_srl, 'inline');
@@ -85,6 +86,7 @@ function editorStart(upload_target_srl) {
         xDisplay('editor_paragraph_'+upload_target_srl, 'block');
         xDisplay('editor_use_paragraph_box_'+upload_target_srl, 'none');
     }
+    */
 
     // 에디터의 내용을 지속적으로 fo_obj.content.value에 입력
     editorSyncContent(fo_obj.content, upload_target_srl);
@@ -184,6 +186,7 @@ function editorReplaceHTML(iframe_obj, html) {
 // 입력 키에 대한 이벤트 체크
 function editorKeyPress(evt) {
     var e = new xEvent(evt);
+    /*
     if (e.keyCode == 13) {
         if(xIE4Up && e.shiftKey == false && !xGetElementById("use_paragraph").checked ) {
             if(e.target.parentElement.document.designMode!="On") return;
@@ -195,6 +198,7 @@ function editorKeyPress(evt) {
             return;
         }
     }
+    */
 
     if (e.ctrlKey) {
         switch(e.keyCode) {