diff --git a/modules/editor/components/image_link/tpl/popup.js b/modules/editor/components/image_link/tpl/popup.js index 2e815a32b..2176f8505 100644 --- a/modules/editor/components/image_link/tpl/popup.js +++ b/modules/editor/components/image_link/tpl/popup.js @@ -24,8 +24,8 @@ function getImage() { var border = node.getAttribute("border"); var align = node.getAttribute("align"); var alt = node.getAttribute("alt"); - var width = node.getAttribute("width"); - var height = node.getAttribute("height"); + var width = xWidth(node); + var height = xHeight(node); orig_width = width; orig_height = height; var link_url = node.getAttribute("link_url"); diff --git a/modules/editor/components/multimedia_link/tpl/popup.js b/modules/editor/components/multimedia_link/tpl/popup.js index 0d0c74900..0215427af 100644 --- a/modules/editor/components/multimedia_link/tpl/popup.js +++ b/modules/editor/components/multimedia_link/tpl/popup.js @@ -45,7 +45,7 @@ function insertMultimedia(obj) { return; } - var text = "\""+caption+"\""; + var text = "\""+caption+"\""; opener.editorFocus(opener.editorPrevSrl); diff --git a/modules/editor/skins/default/editor.html b/modules/editor/skins/default/editor.html index 83ab54470..c5bdae6d6 100644 --- a/modules/editor/skins/default/editor.html +++ b/modules/editor/skins/default/editor.html @@ -151,7 +151,7 @@
- +
diff --git a/modules/editor/tpl/js/uploader.js b/modules/editor/tpl/js/uploader.js index 109e901f7..21233d0f0 100755 --- a/modules/editor/tpl/js/uploader.js +++ b/modules/editor/tpl/js/uploader.js @@ -223,20 +223,28 @@ function editor_preview(sel_obj, upload_target_srl) { function editor_remove_file(upload_target_srl) { var obj = xGetElementById('uploaded_file_list_'+upload_target_srl); if(obj.options.length<1) return; - var file_srl = obj.options[obj.selectedIndex].value; - if(!file_srl) return; // 삭제하려는 파일의 정보를 챙김;; var fo_obj = obj; while(fo_obj.nodeName != 'FORM') { fo_obj = fo_obj.parentNode; } var mid = fo_obj.mid.value; - var url = request_uri+"/?act=procFileDelete&upload_target_srl="+upload_target_srl+"&file_srl="+file_srl+"&mid="+current_url.getQuery('mid'); - // iframe에 url을 보내버림 + // 빈 iframe 구함 var iframe_obj = xGetElementById('tmp_upload_iframe'); if(!iframe_obj) return; - iframe_obj.contentWindow.document.location.href=url; + for(var i=0;i"; + editorReplaceHTML(iframe_obj, text); + // 이미지외의 경우는 multimedia_link 컴포넌트 연결 + } else { + var text = "\"\""; + editorReplaceHTML(iframe_obj, text); + } + + // binary파일의 경우 url_link 컴포넌트 연결 } else { - openComponent("multimedia_link", upload_target_srl, uploaded_filename); - } - - // binary파일의 경우 url_link 컴포넌트 연결 - } else { - var fo_obj = obj; - while(fo_obj.nodeName != 'FORM') { fo_obj = fo_obj.parentNode; } - var mid = fo_obj.mid.value; - var url = request_uri+"/?module=file&act=procFileDownload&file_srl="+file_srl+"&sid="+sid; - openComponent("url_link", upload_target_srl, url); - } + var mid = fo_obj.mid.value; + var url = request_uri+"/?module=file&act=procFileDownload&file_srl="+file_srl+"&sid="+sid; + var text = ""+filename+"
\n"; + editorReplaceHTML(iframe_obj, text); + } + } }