From a64ab93dc1e9dd5929d9194db6edfe0ee068b7b5 Mon Sep 17 00:00:00 2001 From: taggon Date: Thu, 16 Jun 2011 08:32:36 +0000 Subject: [PATCH] issue 44 : Remove x-functions from the member module, the module module and the spamfilter module. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8502 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/skins/default/js/member.js | 29 ++--- modules/member/skins/default/login_form.html | 2 +- modules/member/tpl/js/member_admin.js | 104 +++++++++--------- modules/member/tpl/member_config.html | 4 +- modules/module/tpl/js/module_admin.js | 12 +- modules/spamfilter/tpl/js/spamfilter_admin.js | 4 +- 6 files changed, 73 insertions(+), 82 deletions(-) diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js index 1b2ff9176..e72541756 100644 --- a/modules/member/skins/default/js/member.js +++ b/modules/member/skins/default/js/member.js @@ -43,39 +43,29 @@ function _doUploadImage(fo_obj, act) { /* 프로필 이미지/ 이미지 이름/마크 등록 */ function doUploadProfileImage() { - var fo_obj = xGetElementById("fo_insert_member"); + var fo_obj = get_by_id("fo_insert_member"); if(!fo_obj.profile_image.value) return; _doUploadImage(fo_obj, 'procMemberInsertProfileImage'); } function doUploadImageName() { - var fo_obj = xGetElementById("fo_insert_member"); + var fo_obj = get_by_id("fo_insert_member"); if(!fo_obj.image_name.value) return; _doUploadImage(fo_obj, 'procMemberInsertImageName'); } function doUploadImageMark() { - var fo_obj = xGetElementById("fo_insert_member"); + var fo_obj = get_by_id("fo_insert_member"); if(!fo_obj.image_mark.value) return; _doUploadImage(fo_obj, 'procMemberInsertImageMark'); } -/* 로그인 영역에 포커스 */ -function doFocusUserId(fo_id) { - if(xScrollTop()) return; - var fo_obj = xGetElementById(fo_id); - if(fo_obj.user_id) { - try{ - fo_obj.user_id.focus(); - } catch(e) {}; - } -} /* 로그인 후 */ function completeLogin(ret_obj, response_tags, params, fo_obj) { if(fo_obj.remember_user_id && fo_obj.remember_user_id.checked) { var expire = new Date(); expire.setTime(expire.getTime()+ (7000 * 24 * 3600000)); - xSetCookie('user_id', fo_obj.user_id.value, expire); + setCookie('user_id', fo_obj.user_id.value, expire); } var url = current_url.setQuery('act',''); @@ -104,19 +94,19 @@ function completeResendAuthMail(ret_obj, response_tags) { /* 프로필 이미지/이미지 이름, 마크 삭제 */ function doDeleteProfileImage(member_srl) { - var fo_obj = xGetElementById("fo_insert_member"); + var fo_obj = get_by_id("fo_insert_member"); fo_obj.member_srl.value = member_srl; procFilter(fo_obj, delete_profile_image); } function doDeleteImageName(member_srl) { - var fo_obj = xGetElementById("fo_insert_member"); + var fo_obj = get_by_id("fo_insert_member"); fo_obj.member_srl.value = member_srl; procFilter(fo_obj, delete_image_name); } function doDeleteImageMark(member_srl) { - var fo_obj = xGetElementById("fo_insert_member"); + var fo_obj = get_by_id("fo_insert_member"); fo_obj.member_srl.value = member_srl; procFilter(fo_obj, delete_image_mark); } @@ -157,14 +147,13 @@ function insertSelectedModule(id, module_srl, mid, browser_title) { /* 오픈아이디 연결 */ function doAddOpenIDToMember() { - var fo_obj = xGetElementById("fo_insert_member"); + var fo_obj = get_by_id("fo_insert_member"); procFilter(fo_obj, add_openid_to_member); } /* 오픈아이디 연결 해제 */ function doDeleteOpenIDFromMember(openid) { - var fo_obj = xGetElementById("fo_insert_member"); + var fo_obj = get_by_id("fo_insert_member"); fo_obj.openid_to_delete.value = openid; procFilter(fo_obj, delete_openid_from_member); } - diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html index 08b9952b0..227b05011 100644 --- a/modules/member/skins/default/login_form.html +++ b/modules/member/skins/default/login_form.html @@ -4,7 +4,7 @@ diff --git a/modules/member/tpl/js/member_admin.js b/modules/member/tpl/js/member_admin.js index dbfdeb8a5..caa2334f8 100644 --- a/modules/member/tpl/js/member_admin.js +++ b/modules/member/tpl/js/member_admin.js @@ -43,7 +43,7 @@ function completeInsertGroup(ret_obj) { function doUpdateGroup(group_srl, mode, message) { if(typeof(message)!='undefined'&&!confirm(message)) return; - var fo_obj = xGetElementById('fo_group_info'); + var fo_obj = get_by_id('fo_group_info'); fo_obj.group_srl.value = group_srl; fo_obj.mode.value = mode; procFilter(fo_obj, update_group); @@ -72,7 +72,7 @@ function completeInsertDeniedID(ret_obj) { function doUpdateDeniedID(user_id, mode, message) { if(typeof(message)!='undefined'&&!confirm(message)) return; - var fo_obj = xGetElementById('fo_denied_id_info'); + var fo_obj = get_by_id('fo_denied_id_info'); fo_obj.user_id.value = user_id; fo_obj.mode.value = mode; procFilter(fo_obj, update_denied_id); @@ -82,7 +82,7 @@ function doUpdateDeniedID(user_id, mode, message) { function doUpdateJoinForm(member_join_form_srl, mode, message) { if(typeof(message)!='undefined'&&!confirm(message)) return; - var fo_obj = xGetElementById('fo_join_form_info'); + var fo_obj = get_by_id('fo_join_form_info'); fo_obj.member_join_form_srl.value = member_join_form_srl; fo_obj.mode.value = mode; @@ -121,17 +121,17 @@ function doShowJoinFormValue(sel_obj) { case 'radio' : case 'checkbox' : case 'select' : - xGetElementById('zone_default_value').style.display = 'block'; + get_by_id('zone_default_value').style.display = 'block'; break; default : - xGetElementById('zone_default_value').style.display = 'none'; + get_by_id('zone_default_value').style.display = 'none'; break; } } function doEditDefaultValue(obj, cmd) { - var listup_obj = xGetElementById('default_value_listup'); - var item_obj = xGetElementById('default_value_item'); + var listup_obj = get_by_id('default_value_listup'); + var item_obj = get_by_id('default_value_item'); var idx = listup_obj.selectedIndex; var lng = listup_obj.options.length; var val = item_obj.value; @@ -171,16 +171,16 @@ function doEditDefaultValue(obj, cmd) { value_list[value_list.length] = listup_obj.options[i].value; } - xGetElementById('fo_join_form').default_value.value = value_list.join('|@|'); + get_by_id('fo_join_form').default_value.value = value_list.join('|@|'); } /* 한국 우편 번호 관련 */ function doHideKrZipList(column_name) { - var zone_list_obj = xGetElementById('zone_address_list_'+column_name); - var zone_search_obj = xGetElementById('zone_address_search_'+column_name); - var zone_addr1_obj = xGetElementById('zone_address_1_'+column_name); - var addr1_obj = xGetElementById('fo_insert_member')[column_name][0]; - var field_obj = xGetElementById('fo_insert_member')['_tmp_address_search_'+column_name]; + var zone_list_obj = get_by_id('zone_address_list_'+column_name); + var zone_search_obj = get_by_id('zone_address_search_'+column_name); + var zone_addr1_obj = get_by_id('zone_address_1_'+column_name); + var addr1_obj = get_by_id('fo_insert_member')[column_name][0]; + var field_obj = get_by_id('fo_insert_member')['_tmp_address_search_'+column_name]; zone_addr1_obj.style.display = 'none'; zone_list_obj.style.display = 'none'; @@ -190,13 +190,13 @@ function doHideKrZipList(column_name) { } function doSelectKrZip(column_name) { - var zone_list_obj = xGetElementById('zone_address_list_'+column_name); - var zone_search_obj = xGetElementById('zone_address_search_'+column_name); - var zone_addr1_obj = xGetElementById('zone_address_1_'+column_name); - var sel_obj = xGetElementById('fo_insert_member')['_tmp_address_list_'+column_name]; + var zone_list_obj = get_by_id('zone_address_list_'+column_name); + var zone_search_obj = get_by_id('zone_address_search_'+column_name); + var zone_addr1_obj = get_by_id('zone_address_1_'+column_name); + var sel_obj = get_by_id('fo_insert_member')['_tmp_address_list_'+column_name]; var value = sel_obj.options[sel_obj.selectedIndex].value; - var addr1_obj = xGetElementById('fo_insert_member')[column_name][0]; - var addr2_obj = xGetElementById('fo_insert_member')[column_name][1]; + var addr1_obj = get_by_id('fo_insert_member')[column_name][0]; + var addr2_obj = get_by_id('fo_insert_member')[column_name][1]; addr1_obj.value = value; zone_search_obj.style.display = 'none'; zone_list_obj.style.display = 'none'; @@ -205,7 +205,7 @@ function doSelectKrZip(column_name) { } function doSearchKrZip(column_name) { - var field_obj = xGetElementById('fo_insert_member')['_tmp_address_search_'+column_name]; + var field_obj = get_by_id('fo_insert_member')['_tmp_address_search_'+column_name]; var addr = field_obj.value; if(!addr) return; @@ -225,10 +225,10 @@ function completeSearchKrZip(ret_obj, response_tags, callback_args) { var address_list = ret_obj['address_list'].split("\n"); var column_name = callback_args['column_name']; - var zone_list_obj = xGetElementById('zone_address_list_'+column_name); - var zone_search_obj = xGetElementById('zone_address_search_'+column_name); - var zone_addr1_obj = xGetElementById('zone_address_1_'+column_name); - var sel_obj = xGetElementById('fo_insert_member')['_tmp_address_list_'+column_name]; + var zone_list_obj = get_by_id('zone_address_list_'+column_name); + var zone_search_obj = get_by_id('zone_address_search_'+column_name); + var zone_addr1_obj = get_by_id('zone_address_1_'+column_name); + var sel_obj = get_by_id('fo_insert_member')['_tmp_address_list_'+column_name]; for(var i=0;i
{$lang->skin}
- @@ -183,5 +183,5 @@ diff --git a/modules/module/tpl/js/module_admin.js b/modules/module/tpl/js/module_admin.js index ec069f5fc..857e32db2 100644 --- a/modules/module/tpl/js/module_admin.js +++ b/modules/module/tpl/js/module_admin.js @@ -8,7 +8,7 @@ function doUpdateCategory(module_category_srl, mode, message) { if(typeof(message)!='undefined'&&!confirm(message)) return; - var fo_obj = xGetElementById('fo_category_info'); + var fo_obj = get_by_id('fo_category_info'); fo_obj.module_category_srl.value = module_category_srl; fo_obj.mode.value = mode; @@ -27,7 +27,7 @@ function completeUpdateCategory(ret_obj) { /* 선택된 모듈을 관리자 메뉴의 바로가기에 등록 */ function doAddShortCut(module) { - var fo_obj = xGetElementById("fo_shortcut"); + var fo_obj = get_by_id("fo_shortcut"); fo_obj.selected_module.value = module; procFilter(fo_obj, insert_shortcut); } @@ -89,7 +89,7 @@ function completeInsertGrant(ret_obj) { /* 관리자 아이디 등록/ 제거 */ function doInsertAdmin() { - var fo_obj = xGetElementById("fo_obj"); + var fo_obj = get_by_id("fo_obj"); var sel_obj = fo_obj._admin_member; var admin_id = fo_obj.admin_id.value; if(!admin_id) return; @@ -112,7 +112,7 @@ function doInsertAdmin() { } function doDeleteAdmin() { - var fo_obj = xGetElementById("fo_obj"); + var fo_obj = get_by_id("fo_obj"); var sel_obj = fo_obj._admin_member; sel_obj.remove(sel_obj.selectedIndex); @@ -137,10 +137,10 @@ function completeModuleSetup(ret_obj) { * 언어 관련 **/ function doInsertLangCode(name) { - var fo_obj = xGetElementById("menu_fo"); + var fo_obj = get_by_id("menu_fo"); var target = fo_obj.target.value; if(window.opener && target) { - var obj = window.opener.xGetElementById(target); + var obj = window.opener.get_by_id(target); if(obj) obj.value = '$user_lang->'+name; } window.close(); diff --git a/modules/spamfilter/tpl/js/spamfilter_admin.js b/modules/spamfilter/tpl/js/spamfilter_admin.js index 46d48d8b5..4bf4159ed 100644 --- a/modules/spamfilter/tpl/js/spamfilter_admin.js +++ b/modules/spamfilter/tpl/js/spamfilter_admin.js @@ -2,7 +2,7 @@ * @brief 금지 IP 삭제 **/ function doDeleteDeniedIP(ipaddress) { - var fo_obj = xGetElementById('fo_denied_ip'); + var fo_obj = get_by_id('fo_denied_ip'); fo_obj.ipaddress.value = ipaddress; procFilter(fo_obj, delete_denied_ip); } @@ -11,7 +11,7 @@ function doDeleteDeniedIP(ipaddress) { * @brief 금지 단어 삭제 **/ function doDeleteDeniedWord(word) { - var fo_obj = xGetElementById('fo_denied_word'); + var fo_obj = get_by_id('fo_denied_word'); fo_obj.word.value = word; procFilter(fo_obj, delete_denied_word); }