diff --git a/common/js/common.js b/common/js/common.js index e9745ac15..e3ab373a5 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -131,9 +131,9 @@ function setFixedPopupSize() { // 윈도우에서는 브라우저 상관없이 가로 픽셀이 조금 더 늘어나야 한다. if(xUA.indexOf('windows')>0) { - if(xOp7Up) w += 9; - else if(xIE4Up) w += 8; - else w += 5; + if(xOp7Up) w += 10; + else if(xIE4Up) w += 10; + else w += 6; } window.resizeTo(w,h); diff --git a/modules/editor/components/colorpicker_bg/tpl/popup.js b/modules/editor/components/colorpicker_bg/tpl/popup.js index 1880ed421..a0d060d32 100644 --- a/modules/editor/components/colorpicker_bg/tpl/popup.js +++ b/modules/editor/components/colorpicker_bg/tpl/popup.js @@ -2,10 +2,12 @@ function applyColor() { var code = xGetElementById("color_input").value; + if(opener.xIE4Up) opener.editorDo("BackColor","#"+code, opener.editorPrevSrl); + else opener.editorDo("hilitecolor","#"+code, opener.editorPrevSrl); + opener.editorFocus(opener.editorPrevSrl); - opener.editorSetBackColor("#"+code); - opener.editorFocus(opener.editorPrevSrl); - self.close(); + + window.close(); } /* 색상 클릭시 */ diff --git a/modules/editor/components/colorpicker_text/tpl/popup.js b/modules/editor/components/colorpicker_text/tpl/popup.js index fe215daa6..54ad3d99f 100644 --- a/modules/editor/components/colorpicker_text/tpl/popup.js +++ b/modules/editor/components/colorpicker_text/tpl/popup.js @@ -3,8 +3,11 @@ function applyColor() { var code = xGetElementById("color_input").value; opener.editorFocus(opener.editorPrevSrl); - opener.editorSetForeColor("#"+code); + + opener.editorDo("ForeColor", "#"+code, opener.editorPrevSrl); + opener.editorFocus(opener.editorPrevSrl); + self.close(); } diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html index 55181dbb2..0b5ce1f5e 100644 --- a/modules/editor/components/emoticon/tpl/popup.html +++ b/modules/editor/components/emoticon/tpl/popup.html @@ -3,6 +3,6 @@
-emoticon +emoticon
diff --git a/modules/editor/components/emoticon/tpl/popup.js b/modules/editor/components/emoticon/tpl/popup.js index 448dbe4ad..a8972ed7e 100644 --- a/modules/editor/components/emoticon/tpl/popup.js +++ b/modules/editor/components/emoticon/tpl/popup.js @@ -1,7 +1,13 @@ -function insertImage(obj) { +function insertEmoticon(obj) { if(typeof(opener)=='undefined') return; - opener.editorInsertEmoticon(obj); + var text = "\"emoticon\""; + + opener.editorFocus(opener.editorPrevSrl); + + var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl) + + opener.editorReplaceHTML(iframe_obj, text); opener.editorFocus(opener.editorPrevSrl); window.close(); diff --git a/modules/editor/components/html_editor/edithtml.html b/modules/editor/components/html_editor/edithtml.html deleted file mode 100755 index 9b98ad9f6..000000000 --- a/modules/editor/components/html_editor/edithtml.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Edit Html - - - - - - - -
-
-
-
-
-
- - - diff --git a/modules/editor/components/html_editor/tpl/popup.css b/modules/editor/components/html_editor/tpl/popup.css index b94734a2a..3e99e4802 100644 --- a/modules/editor/components/html_editor/tpl/popup.css +++ b/modules/editor/components/html_editor/tpl/popup.css @@ -1,9 +1,25 @@ -#emoticon_area { - width:230px; - padding:10px 0px 10px 0px; +.editor_area { + width:400px; + background-color:#F3F3F3; text-align:center; } -#emoticon_area img { - margin:2px; +.editor_window { + padding:4px; +} + +.editor_textarea { + width:385px; + height:400px; + border:1px solid #888888; +} + +.editor_button { + text-align:center; +} + +.editor_button input { + margin-top:4px; + background-color:#FFFFFF; + border:1px solid #AAAAAA; } diff --git a/modules/editor/components/html_editor/tpl/popup.html b/modules/editor/components/html_editor/tpl/popup.html new file mode 100755 index 000000000..1bd8d454f --- /dev/null +++ b/modules/editor/components/html_editor/tpl/popup.html @@ -0,0 +1,16 @@ + + + +
+ +
+
+
+
+ + +
+
+
+ +
diff --git a/modules/editor/components/html_editor/tpl/popup.js b/modules/editor/components/html_editor/tpl/popup.js index 448dbe4ad..cb501855a 100644 --- a/modules/editor/components/html_editor/tpl/popup.js +++ b/modules/editor/components/html_editor/tpl/popup.js @@ -1,8 +1,20 @@ -function insertImage(obj) { +function setText() { if(typeof(opener)=='undefined') return; + var text = opener.editorGetSelectedHtml(opener.editorPrevSrl); + xGetElementById("editor").value = text; + xGetElementById("editor").focus(); +} - opener.editorInsertEmoticon(obj); +function insertHtml() { + var text = xGetElementById("editor").value; + opener.editorFocus(opener.editorPrevSrl); + + var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl) + + opener.editorReplaceHTML(iframe_obj, text); opener.editorFocus(opener.editorPrevSrl); window.close(); } + +xAddEventListener(window, 'load', setText); diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index dccde1035..24d2f4f81 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -321,23 +321,6 @@ function editorChangeFontSize(obj,srl) { obj.selectedIndex = 0; } -function editorSetForeColor(color_code) { - editorDo("ForeColor",color_code,editorPrevSrl); - editorFocus(editorPrevSrl); -} - -function editorSetBackColor(color_code) { - if(xIE4Up) editorDo("BackColor",color_code,editorPrevSrl); - else editorDo("hilitecolor",color_code,editorPrevSrl); - editorFocus(editorPrevSrl); -} - -function editorInsertEmoticon(obj) { - editorFocus(editorPrevSrl); - editorDo("InsertImage",obj.src,editorPrevSrl); - editorFocus(editorPrevSrl); -} - function editorDoInsertUrl(link, upload_target_srl) { editorFocus(upload_target_srl); var iframe_obj = editorGetIFrame(srl); @@ -386,15 +369,6 @@ function editorInsertMultimedia(url, width, height) { } } -function editorInsertHTML(html) { - if(!html) return; - - editorFocus(editorPrevSrl); - var obj = editorGetIFrame(editorPrevSrl) - editorReplaceHTML(obj, html); - editorFocus(editorPrevSrl); -} - function editorInsertQuotation(html) { if(!html) return;