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

---
 modules/editor/components/quotation/quotation.class.php | 1 -
 modules/editor/components/quotation/tpl/popup.html      | 4 ++--
 modules/editor/components/quotation/tpl/popup.js        | 6 +++++-
 modules/editor/tpl/js/editor.js                         | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/editor/components/quotation/quotation.class.php b/modules/editor/components/quotation/quotation.class.php
index f8b110b19..370037a04 100644
--- a/modules/editor/components/quotation/quotation.class.php
+++ b/modules/editor/components/quotation/quotation.class.php
@@ -114,7 +114,6 @@
             } else {
                 $output .= sprintf('<div style="%s">', $style);
             }
-            debugPrint($output);
             return $output;
         }
 
diff --git a/modules/editor/components/quotation/tpl/popup.html b/modules/editor/components/quotation/tpl/popup.html
index 97feb4a64..e4a2a2353 100644
--- a/modules/editor/components/quotation/tpl/popup.html
+++ b/modules/editor/components/quotation/tpl/popup.html
@@ -7,9 +7,9 @@
     <div class="editor_title">{$lang->quotation}</div>
 
     <div class="header">{$lang->quotation_use_folder}</div>
-    <div class="body"><input type="checkbox" id="quotation_use" value="Y" onclick="toggle_folder(this)" /></div>
+    <div class="body"><input type="checkbox" id="quotation_use" value="Y" checked="true" onclick="toggle_folder(this)" /></div>
 
-    <div id="folder_area" style="display:none">
+    <div id="folder_area" style="display:block">
         <div class="header">{$lang->quotation_opener}</div>
         <div class="body"><input type="text" class="editor_input_long" id="quotation_opener" value="{$lang->quotation_cmd_opener}" /></div>
 
diff --git a/modules/editor/components/quotation/tpl/popup.js b/modules/editor/components/quotation/tpl/popup.js
index 3a2629c45..135e34033 100644
--- a/modules/editor/components/quotation/tpl/popup.js
+++ b/modules/editor/components/quotation/tpl/popup.js
@@ -130,6 +130,7 @@ function insertQuotation() {
 
     if(!content) content = "&nbsp;";
 
+    var text = "\n<div editor_component=\"quotation\" use_folder=\""+use_folder+"\" folder_opener=\""+folder_opener+"\" folder_closer=\""+folder_closer+"\" bold=\""+bold+"\" color=\""+color+"\" margin=\""+margin+"\" padding=\""+padding+"\" border_style=\""+border_style+"\" border_thickness=\""+border_thickness+"\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\""+style+"\">"+content+"</div>\n";
 
     if(selected_node) {
         selected_node.setAttribute("use_folder", use_folder);
@@ -144,9 +145,12 @@ function insertQuotation() {
         selected_node.setAttribute("border_color", border_color);
         selected_node.setAttribute("bg_color", bg_color);
         selected_node.setAttribute("style", style);
+
+        if(selected_node.outHTML) selected_node.outHTML = text;
+
         opener.editorFocus(opener.editorPrevSrl);
+
     } else {
-        var text = "\n<div editor_component=\"quotation\" use_folder=\""+use_folder+"\" folder_opener=\""+folder_opener+"\" folder_closer=\""+folder_closer+"\" bold=\""+bold+"\" color=\""+color+"\" margin=\""+margin+"\" padding=\""+padding+"\" border_style=\""+border_style+"\" border_thickness=\""+border_thickness+"\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\""+style+"\">"+content+"</div>\n";
 
         opener.editorFocus(opener.editorPrevSrl);
         var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index 368011d02..2fd3dd944 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -283,8 +283,8 @@ function editorProcComponent(ret_obj, response_tags) {
 
     // 컴포넌트의 동작이 새창 열기 일 경우
     if(open_window == 'Y') {
-        var win_left = screen.availWidth / 3;
-        var win_top = screen.availHeight / 3;
+        var win_left = 10;
+        var win_top = 10;
         winopen(popup_url, 'editorComponent', 'left='+win_left+',top='+win_top+',width=10,height=10,toolbars=no,scrollbars=no');
 
     // 새창 열기가 아니면 정해진 영역에 innerHTML로 tpl 입력