From 746c19da193a5b709e01d00c0704d78743af9065 Mon Sep 17 00:00:00 2001
From: taggon <gonom9@gmail.com>
Date: Tue, 19 Jan 2010 11:34:53 +0000
Subject: [PATCH] =?UTF-8?q?#18624280=20=EC=96=B8=EC=96=B4=ED=8C=A9=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
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@7171 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/editor/lang/en.lang.php        |  3 +++
 modules/editor/lang/es.lang.php        |  3 +++
 modules/editor/lang/fr.lang.php        |  3 +++
 modules/editor/lang/jp.lang.php        |  3 +++
 modules/editor/lang/ko.lang.php        |  3 +++
 modules/editor/lang/ru.lang.php        |  3 +++
 modules/editor/lang/vi.lang.php        |  5 ++++-
 modules/editor/lang/zh-CN.lang.php     |  3 +++
 modules/editor/lang/zh-TW.lang.php     |  3 +++
 modules/editor/tpl/js/editor.js        | 17 +++++++----------
 modules/editor/tpl/js/editor_common.js |  6 ++++--
 11 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/modules/editor/lang/en.lang.php b/modules/editor/lang/en.lang.php
index a1f832bc6..0f495a56a 100644
--- a/modules/editor/lang/en.lang.php
+++ b/modules/editor/lang/en.lang.php
@@ -226,4 +226,7 @@
 	$lang->edit->close_help = 'Close Help';
 	
 	$lang->edit->confirm_submit_without_saving = 'There is paragraphs that were not saved.\\nProceed anyway?';
+
+	$lang->edit->image_align = '이미지 정렬';
+	$lang->edit->attached_files = '첨부 파일';
 ?>
diff --git a/modules/editor/lang/es.lang.php b/modules/editor/lang/es.lang.php
index 4c9614c6b..ee923b699 100644
--- a/modules/editor/lang/es.lang.php
+++ b/modules/editor/lang/es.lang.php
@@ -222,4 +222,7 @@
 	$lang->edit->close_help = '도움말 닫기';
 
 	$lang->edit->confirm_submit_without_saving = '저장하지 않은 단락이 있습니다.\\n그냥 전송하시겠습니까?';
+
+	$lang->edit->image_align = '이미지 정렬';
+	$lang->edit->attached_files = '첨부 파일';
 ?>
diff --git a/modules/editor/lang/fr.lang.php b/modules/editor/lang/fr.lang.php
index 15f814d1a..1cd503a8f 100644
--- a/modules/editor/lang/fr.lang.php
+++ b/modules/editor/lang/fr.lang.php
@@ -226,4 +226,7 @@
 	$lang->edit->close_help = '도움말 닫기';
 
 	$lang->edit->confirm_submit_without_saving = '저장하지 않은 단락이 있습니다.\\n그냥 전송하시겠습니까?';
+
+	$lang->edit->image_align = '이미지 정렬';
+	$lang->edit->attached_files = '첨부 파일';
 ?>
diff --git a/modules/editor/lang/jp.lang.php b/modules/editor/lang/jp.lang.php
index 2aa2c0dbc..87baebdf7 100644
--- a/modules/editor/lang/jp.lang.php
+++ b/modules/editor/lang/jp.lang.php
@@ -228,4 +228,7 @@
 	$lang->edit->close_help = 'ヘルプを閉じる';
 
 	$lang->edit->confirm_submit_without_saving = 'まだ保存してない内容があります。\\nそのまま転送して宜しいでしょうか？';
+
+	$lang->edit->image_align = '이미지 정렬';
+	$lang->edit->attached_files = '첨부 파일';
 ?>
diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php
index 06f953cea..5c2aa274e 100644
--- a/modules/editor/lang/ko.lang.php
+++ b/modules/editor/lang/ko.lang.php
@@ -228,4 +228,7 @@
 	$lang->edit->close_help = '도움말 닫기';
 
 	$lang->edit->confirm_submit_without_saving = '저장하지 않은 단락이 있습니다.\\n그냥 전송하시겠습니까?';
+
+	$lang->edit->image_align = '이미지 정렬';
+	$lang->edit->attached_files = '첨부 파일';
 ?>
diff --git a/modules/editor/lang/ru.lang.php b/modules/editor/lang/ru.lang.php
index 5241fe718..9cd144a71 100644
--- a/modules/editor/lang/ru.lang.php
+++ b/modules/editor/lang/ru.lang.php
@@ -222,4 +222,7 @@
 	$lang->edit->close_help = '도움말 닫기';
 
 	$lang->edit->confirm_submit_without_saving = '저장하지 않은 단락이 있습니다.\\n그냥 전송하시겠습니까?';
+
+	$lang->edit->image_align = '이미지 정렬';
+	$lang->edit->attached_files = '첨부 파일';
 ?>
diff --git a/modules/editor/lang/vi.lang.php b/modules/editor/lang/vi.lang.php
index d7e7a2a46..998e6c190 100644
--- a/modules/editor/lang/vi.lang.php
+++ b/modules/editor/lang/vi.lang.php
@@ -227,5 +227,8 @@
 	$lang->edit->toc = 'Board của nội dung';
 	$lang->edit->close_help = '도움말 닫기';
 
-$lang->edit->confirm_submit_without_saving = '저장하지 않은 단락이 있습니다.\\n그냥 전송하시겠습니까?';
+	$lang->edit->confirm_submit_without_saving = '저장하지 않은 단락이 있습니다.\\n그냥 전송하시겠습니까?';
+
+	$lang->edit->image_align = '이미지 정렬';
+	$lang->edit->attached_files = '첨부 파일';
 ?>
diff --git a/modules/editor/lang/zh-CN.lang.php b/modules/editor/lang/zh-CN.lang.php
index 0724d4ea2..41e6714e4 100644
--- a/modules/editor/lang/zh-CN.lang.php
+++ b/modules/editor/lang/zh-CN.lang.php
@@ -228,4 +228,7 @@
     $lang->edit->close_help = '关闭帮助';
 
     $lang->edit->confirm_submit_without_saving = '尚有未保存的段落。\\n确定要提交吗？';
+
+	$lang->edit->image_align = '이미지 정렬';
+	$lang->edit->attached_files = '첨부 파일';
 ?>
diff --git a/modules/editor/lang/zh-TW.lang.php b/modules/editor/lang/zh-TW.lang.php
index 0f003ed85..13bf57e77 100644
--- a/modules/editor/lang/zh-TW.lang.php
+++ b/modules/editor/lang/zh-TW.lang.php
@@ -229,4 +229,7 @@
 	$lang->edit->close_help = '關閉使用手冊';
 
 	$lang->edit->confirm_submit_without_saving = '有內容尚未儲存。\\n是否要繼續進行?';
+
+	$lang->edit->image_align = '이미지 정렬';
+	$lang->edit->attached_files = '첨부 파일';
 ?>
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index 1c4cb3255..38c064521 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -536,21 +536,18 @@ function showEditorHelp(e,editor_sequence){
 }
 
 function showEditorExtension(evt,editor_sequence){
-    var oid = 'editorExtension_'+editor_sequence;
+    var oid = '#editorExtension_'+editor_sequence;
     var e = new xEvent(evt);
-    if(xGetElementById(oid).className =='extension2'){
-        xGetElementById(oid).className = 'extension2 open';
+    if(jQuery(oid).hasClass('extension2')){
+		jQuery(oid).addClass('open');
 
         if(e.pageX <= xWidth('editor_component_'+editor_sequence)){
-            xGetElementById('editor_component_'+editor_sequence).style.right='auto';
-            xGetElementById('editor_component_'+editor_sequence).style.left='0px';
+			jQuery('#editor_component_'+editor_sequence).css('right','auto').css('left', 0);
         }else{
-            xGetElementById('editor_component_'+editor_sequence).style.right='0px';
-            xGetElementById('editor_component_'+editor_sequence).style.left='auto';
+			jQuery('#editor_component_'+editor_sequence).css('right', 0).css('left', 'auto');
         }
-
     }else{
-        xGetElementById(oid).className = 'extension2';
+		jQuery(oid).attr('class', 'extension2');
     }
 }
 
@@ -574,4 +571,4 @@ function getAutoSavedSrl(ret_obj, response_tags, c) {
 
     fo_obj[primary_key].value = ret_obj['document_srl'];
     if(uploadSettingObj[editor_sequence]) editorUploadInit(uploadSettingObj[editor_sequence], true);
-}
+}
\ No newline at end of file
diff --git a/modules/editor/tpl/js/editor_common.js b/modules/editor/tpl/js/editor_common.js
index 07143fe12..4097b926f 100644
--- a/modules/editor/tpl/js/editor_common.js
+++ b/modules/editor/tpl/js/editor_common.js
@@ -24,8 +24,10 @@ function editorGetContent(editor_sequence) {
 
 // 에디터에 포커스를 줌
 function editorFocus(editor_sequence) {
-    var iframe_obj = editorGetIFrame(editor_sequence);
-    iframe_obj.contentWindow.focus();
+	try {
+		var iframe_obj = editorGetIFrame(editor_sequence);
+		iframe_obj.contentWindow.focus();
+	} catch(e){}
 }
 
 /**