From b73b6f39cec952f83ea8b648e7e718f30a9a3b74 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 16 Mar 2007 02:36:34 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@473 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- editor/editor.html | 2 +- editor/js/editor.js | 24 ++++++------------ editor/{component => }/popup/add_emoticon.php | 11 +++++--- editor/{component => }/popup/add_html.php | 8 +++--- editor/{component => }/popup/add_image.php | 9 ++++--- editor/{component => }/popup/add_multi.php | 8 +++--- .../{component => }/popup/add_quotation.php | 8 +++--- editor/{component => }/popup/add_url.php | 8 +++--- editor/{component => }/popup/color_box.php | 8 +++--- editor/{images => popup}/emoticon/msn001.gif | Bin editor/{images => popup}/emoticon/msn002.gif | Bin editor/{images => popup}/emoticon/msn003.gif | Bin editor/{images => popup}/emoticon/msn004.gif | Bin editor/{images => popup}/emoticon/msn005.gif | Bin editor/{images => popup}/emoticon/msn006.gif | Bin editor/{images => popup}/emoticon/msn007.gif | Bin editor/{images => popup}/emoticon/msn008.gif | Bin editor/{images => popup}/emoticon/msn009.gif | Bin editor/{images => popup}/emoticon/msn010.gif | Bin editor/{images => popup}/emoticon/msn011.gif | Bin editor/{images => popup}/emoticon/msn012.gif | Bin editor/{images => popup}/emoticon/msn013.gif | Bin editor/{images => popup}/emoticon/msn014.gif | Bin editor/{images => popup}/emoticon/msn015.gif | Bin editor/{images => popup}/emoticon/msn016.gif | Bin editor/{images => popup}/emoticon/msn017.gif | Bin editor/{images => popup}/emoticon/msn018.gif | Bin editor/{images => popup}/emoticon/msn019.gif | Bin editor/{images => popup}/emoticon/msn020.gif | Bin editor/{images => popup}/emoticon/msn021.gif | Bin editor/{images => popup}/emoticon/msn022.gif | Bin editor/{images => popup}/emoticon/msn023.gif | Bin editor/{images => popup}/emoticon/msn024.gif | Bin editor/{images => popup}/emoticon/msn025.gif | Bin editor/{images => popup}/emoticon/msn026.gif | Bin editor/{images => popup}/emoticon/msn027.gif | Bin editor/{images => popup}/emoticon/msn028.gif | Bin editor/{images => popup}/emoticon/msn029.gif | Bin editor/{images => popup}/emoticon/msn030.gif | Bin editor/{images => popup}/emoticon/msn031.gif | Bin editor/{images => popup}/emoticon/msn032.gif | Bin editor/{images => popup}/emoticon/msn033.gif | Bin editor/{images => popup}/emoticon/msn034.gif | Bin editor/{images => popup}/emoticon/msn035.gif | Bin editor/{images => popup}/emoticon/msn036.gif | Bin editor/{images => popup}/emoticon/msn037.gif | Bin editor/{images => popup}/emoticon/msn038.gif | Bin editor/{images => popup}/emoticon/msn039.gif | Bin editor/{images => popup}/emoticon/msn040.gif | Bin 49 files changed, 46 insertions(+), 40 deletions(-) rename editor/{component => }/popup/add_emoticon.php (55%) rename editor/{component => }/popup/add_html.php (78%) rename editor/{component => }/popup/add_image.php (82%) rename editor/{component => }/popup/add_multi.php (83%) rename editor/{component => }/popup/add_quotation.php (95%) rename editor/{component => }/popup/add_url.php (87%) rename editor/{component => }/popup/color_box.php (82%) rename editor/{images => popup}/emoticon/msn001.gif (100%) rename editor/{images => popup}/emoticon/msn002.gif (100%) rename editor/{images => popup}/emoticon/msn003.gif (100%) rename editor/{images => popup}/emoticon/msn004.gif (100%) rename editor/{images => popup}/emoticon/msn005.gif (100%) rename editor/{images => popup}/emoticon/msn006.gif (100%) rename editor/{images => popup}/emoticon/msn007.gif (100%) rename editor/{images => popup}/emoticon/msn008.gif (100%) rename editor/{images => popup}/emoticon/msn009.gif (100%) rename editor/{images => popup}/emoticon/msn010.gif (100%) rename editor/{images => popup}/emoticon/msn011.gif (100%) rename editor/{images => popup}/emoticon/msn012.gif (100%) rename editor/{images => popup}/emoticon/msn013.gif (100%) rename editor/{images => popup}/emoticon/msn014.gif (100%) rename editor/{images => popup}/emoticon/msn015.gif (100%) rename editor/{images => popup}/emoticon/msn016.gif (100%) rename editor/{images => popup}/emoticon/msn017.gif (100%) rename editor/{images => popup}/emoticon/msn018.gif (100%) rename editor/{images => popup}/emoticon/msn019.gif (100%) rename editor/{images => popup}/emoticon/msn020.gif (100%) rename editor/{images => popup}/emoticon/msn021.gif (100%) rename editor/{images => popup}/emoticon/msn022.gif (100%) rename editor/{images => popup}/emoticon/msn023.gif (100%) rename editor/{images => popup}/emoticon/msn024.gif (100%) rename editor/{images => popup}/emoticon/msn025.gif (100%) rename editor/{images => popup}/emoticon/msn026.gif (100%) rename editor/{images => popup}/emoticon/msn027.gif (100%) rename editor/{images => popup}/emoticon/msn028.gif (100%) rename editor/{images => popup}/emoticon/msn029.gif (100%) rename editor/{images => popup}/emoticon/msn030.gif (100%) rename editor/{images => popup}/emoticon/msn031.gif (100%) rename editor/{images => popup}/emoticon/msn032.gif (100%) rename editor/{images => popup}/emoticon/msn033.gif (100%) rename editor/{images => popup}/emoticon/msn034.gif (100%) rename editor/{images => popup}/emoticon/msn035.gif (100%) rename editor/{images => popup}/emoticon/msn036.gif (100%) rename editor/{images => popup}/emoticon/msn037.gif (100%) rename editor/{images => popup}/emoticon/msn038.gif (100%) rename editor/{images => popup}/emoticon/msn039.gif (100%) rename editor/{images => popup}/emoticon/msn040.gif (100%) diff --git a/editor/editor.html b/editor/editor.html index 43ab0eec1..1108cd127 100644 --- a/editor/editor.html +++ b/editor/editor.html @@ -4,7 +4,7 @@ diff --git a/editor/js/editor.js b/editor/js/editor.js index 8651ce029..a93e8910f 100755 --- a/editor/js/editor.js +++ b/editor/js/editor.js @@ -225,51 +225,44 @@ function editorEventCheck(evt) { case "addemoticon" : var x = (screen.availWidth - 225)/2; var y = (screen.availHeight - 150)/2; - var editor_popup = window.open(editor_path+"popup/add_emoticon.php","_editorPopup","top="+y+",left="+x+",width=225,height=150,resizable=no,toolbars=no,scrollbars=no"); - if(editor_popup) editor_popup.focus(); + winopen(editor_path+"popup/add_emoticon.php","_editorPopup","top="+y+",left="+x+",width=50,height=50,resizable=no,toolbars=no,scrollbars=no"); return; break; case "quotation" : var x = (screen.availWidth - 400)/2; var y = (screen.availHeight - 400)/2; - var editor_popup = window.open(editor_path+"popup/add_quotation.php","_editorPopup","top="+y+",left="+x+",width=400,height=400,resizable=no,toolbars=no,scrollbars=no"); - if(editor_popup) editor_popup.focus(); + winopen(editor_path+"popup/add_quotation.php","_editorPopup","top="+y+",left="+x+",width=50,height=50,resizable=no,toolbars=no,scrollbars=no"); return; break; case "addurl" : var x = (screen.availWidth - 400)/2; var y = (screen.availHeight - 220)/2; - var editor_popup = window.open(editor_path+"popup/add_url.php","_editorPopup","top="+y+",left="+x+",width=400,height=220,resizable=no,toolbars=no,scrollbars=no"); - if(editor_popup) editor_popup.focus(); + winopen(editor_path+"popup/add_url.php","_editorPopup","top="+y+",left="+x+",width=50,height=50,resizable=no,toolbars=no,scrollbars=no"); return; break; case "addimage" : var x = (screen.availWidth - 420)/2; var y = (screen.availHeight - 80)/2; - var editor_popup = window.open(editor_path+"popup/add_image.php","_editorPopup","top="+y+",left="+x+",width=420,height=80,resizable=no,toolbars=no,scrollbars=no"); - if(editor_popup) editor_popup.focus(); + winopen(editor_path+"popup/add_image.php","_editorPopup","top="+y+",left="+x+",width=50,height=50,resizable=no,toolbars=no,scrollbars=no"); return; break; case "addmultimedia" : var x = (screen.availWidth - 400)/2; var y = (screen.availHeight - 220)/2; - var editor_popup = window.open(editor_path+"popup/add_multi.php","_editorPopup","top="+y+",left="+x+",width=420,height=110,resizable=no,toolbars=no,scrollbars=no"); - if(editor_popup) editor_popup.focus(); + winopen(editor_path+"popup/add_multi.php","_editorPopup","top="+y+",left="+x+",width=50,height=50,resizable=no,toolbars=no,scrollbars=no"); return; break; case "addhtml" : var x = (screen.availWidth - 400)/2; var y = (screen.availHeight - 500)/2; - var editor_popup = window.open(editor_path+"popup/add_html.php","_editorPopup","top="+y+",left="+x+",width=400,height=500,resizable=no,toolbars=no,scrollbars=no"); - if(editor_popup) editor_popup.focus(); + winopen(editor_path+"popup/add_html.php","_editorPopup","top="+y+",left="+x+",width=50,height=50,resizable=no,toolbars=no,scrollbars=no"); return; break; case "ForeColor" : case "BackColor" : var x = (screen.availWidth - 145)/2; var y = (screen.availHeight - 95)/2; - var editor_popup = window.open(editor_path+"popup/color_box.php?mode="+method_name,"_editorPopup","top="+y+",left="+x+",width=145,height=95,resizable=no,toolbars=no,scrollbars=no"); - if(editor_popup) editor_popup.focus(); + winopen(editor_path+"popup/color_box.php?mode="+method_name,"_editorPopup","top="+y+",left="+x+",width=50,height=50,resizable=no,toolbars=no,scrollbars=no"); return; } break; @@ -699,8 +692,7 @@ function editor_insert_file(upload_target_srl, align) { var x = (screen.availWidth - 400)/2; var y = (screen.availHeight - 220)/2; - var editor_popup = window.open(editor_path+"popup/add_url.php?title="+escape(filename)+"&url="+escape(url),"_editorPopup","top="+y+",left="+x+",width=400,height=220,resizable=no,toolbars=no,scrollbars=no"); - if(editor_popup) editor_popup.focus(); + winopen(editor_path+"popup/add_url.php?title="+escape(filename)+"&url="+escape(url),"_editorPopup","top="+y+",left="+x+",width=400,height=220,resizable=no,toolbars=no,scrollbars=no"); } } diff --git a/editor/component/popup/add_emoticon.php b/editor/popup/add_emoticon.php similarity index 55% rename from editor/component/popup/add_emoticon.php rename to editor/popup/add_emoticon.php index 0c300ea6d..6525d067c 100644 --- a/editor/component/popup/add_emoticon.php +++ b/editor/popup/add_emoticon.php @@ -3,16 +3,17 @@ add Emoticon - - - + + + + + diff --git a/editor/component/popup/add_html.php b/editor/popup/add_html.php similarity index 78% rename from editor/component/popup/add_html.php rename to editor/popup/add_html.php index c108206cb..9b98ad9f6 100755 --- a/editor/component/popup/add_html.php +++ b/editor/popup/add_html.php @@ -3,9 +3,10 @@ Edit Html - - - + + + + diff --git a/editor/component/popup/add_image.php b/editor/popup/add_image.php similarity index 82% rename from editor/component/popup/add_image.php rename to editor/popup/add_image.php index 30dfb8a3d..657cd1eab 100644 --- a/editor/component/popup/add_image.php +++ b/editor/popup/add_image.php @@ -3,9 +3,10 @@ add Image - - - + + + + diff --git a/editor/component/popup/add_multi.php b/editor/popup/add_multi.php similarity index 83% rename from editor/component/popup/add_multi.php rename to editor/popup/add_multi.php index 85dab24b5..6eebcddcf 100644 --- a/editor/component/popup/add_multi.php +++ b/editor/popup/add_multi.php @@ -3,9 +3,10 @@ add Multimedia - - - + + + + diff --git a/editor/component/popup/add_quotation.php b/editor/popup/add_quotation.php similarity index 95% rename from editor/component/popup/add_quotation.php rename to editor/popup/add_quotation.php index 066a31631..b0d4309c2 100644 --- a/editor/component/popup/add_quotation.php +++ b/editor/popup/add_quotation.php @@ -3,9 +3,10 @@ add Quotation - - - + + + + diff --git a/editor/component/popup/add_url.php b/editor/popup/add_url.php similarity index 87% rename from editor/component/popup/add_url.php rename to editor/popup/add_url.php index 9705bceb0..fc96ea5b2 100644 --- a/editor/component/popup/add_url.php +++ b/editor/popup/add_url.php @@ -3,9 +3,10 @@ add Url - - - + + + + diff --git a/editor/component/popup/color_box.php b/editor/popup/color_box.php similarity index 82% rename from editor/component/popup/color_box.php rename to editor/popup/color_box.php index 82df6f561..49b8925b7 100644 --- a/editor/component/popup/color_box.php +++ b/editor/popup/color_box.php @@ -3,9 +3,10 @@ change Color - - - + + + + diff --git a/editor/images/emoticon/msn001.gif b/editor/popup/emoticon/msn001.gif similarity index 100% rename from editor/images/emoticon/msn001.gif rename to editor/popup/emoticon/msn001.gif diff --git a/editor/images/emoticon/msn002.gif b/editor/popup/emoticon/msn002.gif similarity index 100% rename from editor/images/emoticon/msn002.gif rename to editor/popup/emoticon/msn002.gif diff --git a/editor/images/emoticon/msn003.gif b/editor/popup/emoticon/msn003.gif similarity index 100% rename from editor/images/emoticon/msn003.gif rename to editor/popup/emoticon/msn003.gif diff --git a/editor/images/emoticon/msn004.gif b/editor/popup/emoticon/msn004.gif similarity index 100% rename from editor/images/emoticon/msn004.gif rename to editor/popup/emoticon/msn004.gif diff --git a/editor/images/emoticon/msn005.gif b/editor/popup/emoticon/msn005.gif similarity index 100% rename from editor/images/emoticon/msn005.gif rename to editor/popup/emoticon/msn005.gif diff --git a/editor/images/emoticon/msn006.gif b/editor/popup/emoticon/msn006.gif similarity index 100% rename from editor/images/emoticon/msn006.gif rename to editor/popup/emoticon/msn006.gif diff --git a/editor/images/emoticon/msn007.gif b/editor/popup/emoticon/msn007.gif similarity index 100% rename from editor/images/emoticon/msn007.gif rename to editor/popup/emoticon/msn007.gif diff --git a/editor/images/emoticon/msn008.gif b/editor/popup/emoticon/msn008.gif similarity index 100% rename from editor/images/emoticon/msn008.gif rename to editor/popup/emoticon/msn008.gif diff --git a/editor/images/emoticon/msn009.gif b/editor/popup/emoticon/msn009.gif similarity index 100% rename from editor/images/emoticon/msn009.gif rename to editor/popup/emoticon/msn009.gif diff --git a/editor/images/emoticon/msn010.gif b/editor/popup/emoticon/msn010.gif similarity index 100% rename from editor/images/emoticon/msn010.gif rename to editor/popup/emoticon/msn010.gif diff --git a/editor/images/emoticon/msn011.gif b/editor/popup/emoticon/msn011.gif similarity index 100% rename from editor/images/emoticon/msn011.gif rename to editor/popup/emoticon/msn011.gif diff --git a/editor/images/emoticon/msn012.gif b/editor/popup/emoticon/msn012.gif similarity index 100% rename from editor/images/emoticon/msn012.gif rename to editor/popup/emoticon/msn012.gif diff --git a/editor/images/emoticon/msn013.gif b/editor/popup/emoticon/msn013.gif similarity index 100% rename from editor/images/emoticon/msn013.gif rename to editor/popup/emoticon/msn013.gif diff --git a/editor/images/emoticon/msn014.gif b/editor/popup/emoticon/msn014.gif similarity index 100% rename from editor/images/emoticon/msn014.gif rename to editor/popup/emoticon/msn014.gif diff --git a/editor/images/emoticon/msn015.gif b/editor/popup/emoticon/msn015.gif similarity index 100% rename from editor/images/emoticon/msn015.gif rename to editor/popup/emoticon/msn015.gif diff --git a/editor/images/emoticon/msn016.gif b/editor/popup/emoticon/msn016.gif similarity index 100% rename from editor/images/emoticon/msn016.gif rename to editor/popup/emoticon/msn016.gif diff --git a/editor/images/emoticon/msn017.gif b/editor/popup/emoticon/msn017.gif similarity index 100% rename from editor/images/emoticon/msn017.gif rename to editor/popup/emoticon/msn017.gif diff --git a/editor/images/emoticon/msn018.gif b/editor/popup/emoticon/msn018.gif similarity index 100% rename from editor/images/emoticon/msn018.gif rename to editor/popup/emoticon/msn018.gif diff --git a/editor/images/emoticon/msn019.gif b/editor/popup/emoticon/msn019.gif similarity index 100% rename from editor/images/emoticon/msn019.gif rename to editor/popup/emoticon/msn019.gif diff --git a/editor/images/emoticon/msn020.gif b/editor/popup/emoticon/msn020.gif similarity index 100% rename from editor/images/emoticon/msn020.gif rename to editor/popup/emoticon/msn020.gif diff --git a/editor/images/emoticon/msn021.gif b/editor/popup/emoticon/msn021.gif similarity index 100% rename from editor/images/emoticon/msn021.gif rename to editor/popup/emoticon/msn021.gif diff --git a/editor/images/emoticon/msn022.gif b/editor/popup/emoticon/msn022.gif similarity index 100% rename from editor/images/emoticon/msn022.gif rename to editor/popup/emoticon/msn022.gif diff --git a/editor/images/emoticon/msn023.gif b/editor/popup/emoticon/msn023.gif similarity index 100% rename from editor/images/emoticon/msn023.gif rename to editor/popup/emoticon/msn023.gif diff --git a/editor/images/emoticon/msn024.gif b/editor/popup/emoticon/msn024.gif similarity index 100% rename from editor/images/emoticon/msn024.gif rename to editor/popup/emoticon/msn024.gif diff --git a/editor/images/emoticon/msn025.gif b/editor/popup/emoticon/msn025.gif similarity index 100% rename from editor/images/emoticon/msn025.gif rename to editor/popup/emoticon/msn025.gif diff --git a/editor/images/emoticon/msn026.gif b/editor/popup/emoticon/msn026.gif similarity index 100% rename from editor/images/emoticon/msn026.gif rename to editor/popup/emoticon/msn026.gif diff --git a/editor/images/emoticon/msn027.gif b/editor/popup/emoticon/msn027.gif similarity index 100% rename from editor/images/emoticon/msn027.gif rename to editor/popup/emoticon/msn027.gif diff --git a/editor/images/emoticon/msn028.gif b/editor/popup/emoticon/msn028.gif similarity index 100% rename from editor/images/emoticon/msn028.gif rename to editor/popup/emoticon/msn028.gif diff --git a/editor/images/emoticon/msn029.gif b/editor/popup/emoticon/msn029.gif similarity index 100% rename from editor/images/emoticon/msn029.gif rename to editor/popup/emoticon/msn029.gif diff --git a/editor/images/emoticon/msn030.gif b/editor/popup/emoticon/msn030.gif similarity index 100% rename from editor/images/emoticon/msn030.gif rename to editor/popup/emoticon/msn030.gif diff --git a/editor/images/emoticon/msn031.gif b/editor/popup/emoticon/msn031.gif similarity index 100% rename from editor/images/emoticon/msn031.gif rename to editor/popup/emoticon/msn031.gif diff --git a/editor/images/emoticon/msn032.gif b/editor/popup/emoticon/msn032.gif similarity index 100% rename from editor/images/emoticon/msn032.gif rename to editor/popup/emoticon/msn032.gif diff --git a/editor/images/emoticon/msn033.gif b/editor/popup/emoticon/msn033.gif similarity index 100% rename from editor/images/emoticon/msn033.gif rename to editor/popup/emoticon/msn033.gif diff --git a/editor/images/emoticon/msn034.gif b/editor/popup/emoticon/msn034.gif similarity index 100% rename from editor/images/emoticon/msn034.gif rename to editor/popup/emoticon/msn034.gif diff --git a/editor/images/emoticon/msn035.gif b/editor/popup/emoticon/msn035.gif similarity index 100% rename from editor/images/emoticon/msn035.gif rename to editor/popup/emoticon/msn035.gif diff --git a/editor/images/emoticon/msn036.gif b/editor/popup/emoticon/msn036.gif similarity index 100% rename from editor/images/emoticon/msn036.gif rename to editor/popup/emoticon/msn036.gif diff --git a/editor/images/emoticon/msn037.gif b/editor/popup/emoticon/msn037.gif similarity index 100% rename from editor/images/emoticon/msn037.gif rename to editor/popup/emoticon/msn037.gif diff --git a/editor/images/emoticon/msn038.gif b/editor/popup/emoticon/msn038.gif similarity index 100% rename from editor/images/emoticon/msn038.gif rename to editor/popup/emoticon/msn038.gif diff --git a/editor/images/emoticon/msn039.gif b/editor/popup/emoticon/msn039.gif similarity index 100% rename from editor/images/emoticon/msn039.gif rename to editor/popup/emoticon/msn039.gif diff --git a/editor/images/emoticon/msn040.gif b/editor/popup/emoticon/msn040.gif similarity index 100% rename from editor/images/emoticon/msn040.gif rename to editor/popup/emoticon/msn040.gif