diff --git a/common/js/common.js b/common/js/common.js index 7a709416a..d9504f8cb 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -79,6 +79,7 @@ function resizeImageContents() { } xAddEventListener(window, "load", resizeImageContents); +// 컨텐츠에서 컨텐츠 영역보다 큰 이미지 리사이징후 팝업 클릭시 사용되는 함수 function resizeImagePopup(evt) { var e = new xEvent(evt); if(!e.target.src) return; @@ -125,23 +126,11 @@ function svc_folder_close(id) { // 팝업의 내용에 맞게 크기를 늘리는 것은... 쉽게 되지는 않음.. ㅡ.ㅜ // 혹시.. 제대로 된 소스 있으신 분은 헬프미.. ㅠ0ㅠ function setFixedPopupSize() { - var i=0; - while(i<2) { - window.scrollTo(03000,03000); - window.resizeBy(xScrollLeft(), xScrollTop()); - i++; - } - window.scrollTo(0,0); - - // IE의 경우 한번더 해줘야 한다. (이게 맞는건지.. ㅡ.ㅜ) - if(xIE4Up) { - var i=0; - while(i<2) { - var height = xHeight(xGetElementById("popup_content")); - if(xGetBodyHeight()!=height) window.resizeBy(0, height-xGetBodyHeight()); - i++; - } - } + var w = xWidth("popup_content"); + var h = xHeight("popup_content"); + var w1 = xWidth(window.document.body); + var h1 = xHeight(window.document.body); + window.resizeBy(w-w1,h-h1); } // url이동 (open_window 값이 N 가 아니면 새창으로 띄움) diff --git a/modules/editor/components/colorpicker_bg/tpl/popup.css b/modules/editor/components/colorpicker_bg/tpl/popup.css index 92bcb5494..6a1911cba 100644 --- a/modules/editor/components/colorpicker_bg/tpl/popup.css +++ b/modules/editor/components/colorpicker_bg/tpl/popup.css @@ -1,3 +1,9 @@ +.colorpicker { + width:138px; + height:85px; + padding:5px; +} + img.color_icon { width:15px; height:15px; diff --git a/modules/editor/components/colorpicker_bg/tpl/popup.html b/modules/editor/components/colorpicker_bg/tpl/popup.html index 1513b92ba..95e2a2e02 100644 --- a/modules/editor/components/colorpicker_bg/tpl/popup.html +++ b/modules/editor/components/colorpicker_bg/tpl/popup.html @@ -1,6 +1,7 @@ - +
+ +
diff --git a/modules/editor/components/colorpicker_bg/tpl/popup.js b/modules/editor/components/colorpicker_bg/tpl/popup.js index 8276aa06b..62c4df53c 100644 --- a/modules/editor/components/colorpicker_bg/tpl/popup.js +++ b/modules/editor/components/colorpicker_bg/tpl/popup.js @@ -1,5 +1,6 @@ var color_list = new Array('000000','993300','333300','003300','003366','000080','333399','333333','800000','FF6600','808000','008000','008080','0000FF','666699','808080','FF0000','FF9900','99CC00','339966','33CCCC','3366FF','800080','969696','FF00FF','FFCC00','FFFF00','00FF00','00FFFF','00CCFF','993366','c0c0c0','FF99CC','FFCC99','FFFF99','CCFFCC','CCFFFF','99CCFF','CC99FF','FFFFFF'); +/* 부모창의 위지윅 에디터의 선택된 영역의 글자색을 변경 */ function setColor(color) { opener.editorFocus(opener.editorPrevSrl); opener.editorSetBackColor("#"+color); @@ -7,10 +8,16 @@ function setColor(color) { self.close(); } -function printColor() { +/* 색상표를 출력 */ +function printColor(blank_img_src) { var html = ""; for(var i=0;i\"color\"<\/div>"; + html += printColorBlock(color_list[i], blank_img_src); } document.write(html); } + +/* 개별 색상 block 출력 함수 */ +function printColorBlock(code, blank_img_src) { + return "
\"color\"<\/div>"; +}