diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js index 0dfe1b9be..181810e7d 100644 --- a/common/js/xml_js_filter.js +++ b/common/js/xml_js_filter.js @@ -25,7 +25,7 @@ function filterAlertMessage(ret_obj) { if(typeof(message)!="undefined"&&message&&message!="success") alert(message); - if(typeof(act)!="undefined" && act) url = location.href.setQuery("act", act); + if(typeof(act)!="undefined" && act) url = current_url.setQuery("act", act); else if(typeof(redirect_url)!="undefined" && redirect_url) url = redirect_url; location.href = url; diff --git a/modules/blog/skins/default/js/blog.js b/modules/blog/skins/default/js/blog.js index 3e1973483..2c5116fd8 100644 --- a/modules/blog/skins/default/js/blog.js +++ b/modules/blog/skins/default/js/blog.js @@ -67,7 +67,7 @@ function completeDocumentInserted(ret_obj) { alert(message); - var url = location.href.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act',''); + var url = current_url.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act',''); if(category_srl) url = url.setQuery('category',category_srl); location.href = url; } diff --git a/modules/blog/skins/default/js/blog_tree_menu.js b/modules/blog/skins/default/js/blog_tree_menu.js index 26b13a002..0a932d26a 100644 --- a/modules/blog/skins/default/js/blog_tree_menu.js +++ b/modules/blog/skins/default/js/blog_tree_menu.js @@ -250,6 +250,6 @@ function blogSelectNode(node_srl) { var node = blog_node_info_list[node_srl]; if(!node) return; - var url = location.href.setQuery('category',node_srl).setQuery('page','').setQuery('search_target','').setQuery('search_keyword',''); + var url = current_url.setQuery('category',node_srl).setQuery('page','').setQuery('search_target','').setQuery('search_keyword',''); location.href = url; } diff --git a/modules/blog/tpl/js/blog_admin.js b/modules/blog/tpl/js/blog_admin.js index 765d375ce..16a69f7ca 100644 --- a/modules/blog/tpl/js/blog_admin.js +++ b/modules/blog/tpl/js/blog_admin.js @@ -13,7 +13,7 @@ function completeInsertBlog(ret_obj) { alert(message); - var url = location.href.setQuery('act','dispBlogAdminBlogInfo'); + var url = current_url.setQuery('act','dispBlogAdminBlogInfo'); location.href = url; } @@ -24,7 +24,7 @@ function completeDeleteBlog(ret_obj) { var page = ret_obj['page']; alert(message); - var url = location.href.setQuery('act','dispBlogAdminContent').setQuery('module_srl',''); + var url = current_url.setQuery('act','dispBlogAdminContent').setQuery('module_srl',''); if(page) url = url.setQuery('page',page); location.href = url; } @@ -48,7 +48,7 @@ function completeUpdateCategory(ret_obj) { var page = ret_obj['page']; alert(message); - var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBlogAdminCategoryInfo'); + var url = current_url.setQuery('module_srl',module_srl).setQuery('act','dispBlogAdminCategoryInfo'); if(page) url.setQuery('page',page); location.href = url; } @@ -86,7 +86,7 @@ function completeInsertGrant(ret_obj) { alert(message); - var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBlogAdminGrantInfo'); + var url = current_url.setQuery('module_srl',module_srl).setQuery('act','dispBlogAdminGrantInfo'); if(page) url.setQuery('page',page); location.href = url; } diff --git a/modules/board/skins/default/js/board.js b/modules/board/skins/default/js/board.js index f40041cce..7fd68bea6 100644 --- a/modules/board/skins/default/js/board.js +++ b/modules/board/skins/default/js/board.js @@ -27,7 +27,7 @@ function completeDocumentInserted(ret_obj) { alert(message); - var url = location.href.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act',''); + var url = current_url.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act',''); if(category_srl) url = url.setQuery('category',category_srl); location.href = url; } @@ -126,6 +126,6 @@ function doChangeCategory(sel_obj, url) { var category_srl = sel_obj.options[sel_obj.selectedIndex].value; if(!category_srl) location.href=url; else { - location.href = location.href.setQuery('category',category_srl); + location.href = current_url.setQuery('category',category_srl); } } diff --git a/modules/board/tpl/js/board_admin.js b/modules/board/tpl/js/board_admin.js index 148562b46..eb9938f9d 100644 --- a/modules/board/tpl/js/board_admin.js +++ b/modules/board/tpl/js/board_admin.js @@ -14,7 +14,7 @@ function completeInsertBoard(ret_obj) { alert(message); - var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBoardAdminBoardInfo'); + var url = current_url.setQuery('module_srl',module_srl).setQuery('act','dispBoardAdminBoardInfo'); if(page) url.setQuery('page',page); location.href = url; } @@ -26,7 +26,7 @@ function completeDeleteBoard(ret_obj) { var page = ret_obj['page']; alert(message); - var url = location.href.setQuery('act','dispBoardAdminContent').setQuery('module_srl',''); + var url = current_url.setQuery('act','dispBoardAdminContent').setQuery('module_srl',''); if(page) url = url.setQuery('page',page); location.href = url; } @@ -50,7 +50,7 @@ function completeUpdateCategory(ret_obj) { var page = ret_obj['page']; alert(message); - var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBoardAdminCategoryInfo'); + var url = current_url.setQuery('module_srl',module_srl).setQuery('act','dispBoardAdminCategoryInfo'); if(page) url.setQuery('page',page); location.href = url; } @@ -88,7 +88,7 @@ function completeInsertGrant(ret_obj) { alert(message); - var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBoardAdminGrantInfo'); + var url = current_url.setQuery('module_srl',module_srl).setQuery('act','dispBoardAdminGrantInfo'); if(page) url.setQuery('page',page); location.href = url; } diff --git a/modules/layout/tpl/js/layout_admin.js b/modules/layout/tpl/js/layout_admin.js index bb13bbe7f..6a2e70152 100644 --- a/modules/layout/tpl/js/layout_admin.js +++ b/modules/layout/tpl/js/layout_admin.js @@ -1,7 +1,7 @@ /* 레이아웃 신규 생성시 완료 후 요청하는 함수 */ function completeInsertLayout(ret_obj) { var layout_srl = ret_obj['layout_srl']; - var url = location.href.setQuery('act','dispLayoutAdminModify').setQuery('layout_srl',layout_srl); + var url = current_url.setQuery('act','dispLayoutAdminModify').setQuery('layout_srl',layout_srl); location.href = url; } @@ -39,6 +39,6 @@ function doMenuManagement(menu_id) { if(sel_obj.selectedIndex == 0) return; var menu_srl = sel_obj.options[sel_obj.selectedIndex].value; - var url = location.href.setQuery('act','dispMenuAdminManagement').setQuery('menu_srl',menu_srl); + var url = current_url.setQuery('act','dispMenuAdminManagement').setQuery('menu_srl',menu_srl); location.href = url; } diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js index 23cb00526..fbb7122f8 100644 --- a/modules/member/skins/default/js/member.js +++ b/modules/member/skins/default/js/member.js @@ -7,7 +7,7 @@ function completeInsert(ret_obj, response_tags, args, fo_obj) { alert(message); if(redirect_url) location.href = redirect_url; - else location.href = location.href.setQuery('act',''); + else location.href = current_url.setQuery('act',''); } /* 정보 수정 */ @@ -17,7 +17,7 @@ function completeModify(ret_obj, response_tags, args, fo_obj) { alert(message); - location.href = location.href.setQuery('act','dispMemberInfo'); + location.href = current_url.setQuery('act','dispMemberInfo'); } /* 이미지 업로드 */ @@ -77,13 +77,13 @@ function completeLogin(ret_obj, response_tags, params, fo_obj) { xSetCookie('user_id', fo_obj.user_id.value, expire); } - var url = location.href.setQuery('act',''); - location.href = location.href.setQuery('act',''); + var url = current_url.setQuery('act',''); + location.href = current_url.setQuery('act',''); } /* 로그아웃 후 */ function completeLogout(ret_obj) { - location.href = location.href.setQuery('act',''); + location.href = current_url.setQuery('act',''); } /* 이미지 이름, 마크 삭제 */ @@ -125,7 +125,7 @@ function doDeleteMessage(message_srl) { function completeDeleteMessage(ret_obj) { alert(ret_obj['message']); - location.href = location.href.setQuery('message_srl',''); + location.href = current_url.setQuery('message_srl',''); } /* 개별 쪽지 보관 */ @@ -139,7 +139,7 @@ function doStoreMessage(message_srl) { function completeStoreMessage(ret_obj) { alert(ret_obj['message']); - location.href = location.href.setQuery('message_srl',''); + location.href = current_url.setQuery('message_srl',''); } /* 친구 추가 후 */ @@ -168,7 +168,7 @@ function doDeleteFriendGroup(friend_group_srl) { function completeDeleteFriendGroup(ret_obj) { alert(ret_obj['message']); - location.href = location.href.setQuery('friend_group_srl',''); + location.href = current_url.setQuery('friend_group_srl',''); } /* 친구 그룹의 이름 변경 */ diff --git a/modules/member/tpl/js/member_admin.js b/modules/member/tpl/js/member_admin.js index 552ab9e74..5c8374ebf 100644 --- a/modules/member/tpl/js/member_admin.js +++ b/modules/member/tpl/js/member_admin.js @@ -7,7 +7,7 @@ function completeInsert(ret_obj) { alert(message); - var url = location.href.setQuery('act','dispMemberAdminInfo').setQuery('member_srl',member_srl); + var url = current_url.setQuery('act','dispMemberAdminInfo').setQuery('member_srl',member_srl); if(page) url = url.setQuery('page', page); location.href = url; @@ -21,7 +21,7 @@ function completeDelete(ret_obj) { alert(message); - var url = location.href.setQuery('act','dispMemberAdminList'); + var url = current_url.setQuery('act','dispMemberAdminList'); location.href = url; } @@ -34,7 +34,7 @@ function completeInsertGroup(ret_obj) { alert(message); - var url = location.href.setQuery('act','dispMemberAdminGroupList'); + var url = current_url.setQuery('act','dispMemberAdminGroupList'); location.href = url; } @@ -51,7 +51,7 @@ function doUpdateGroup(group_srl, mode, message) { function completeUpdateGroup(ret_obj) { var page = ret_obj['page']; - var url = location.href.setQuery('act','dispMemberAdminGroupList'); + var url = current_url.setQuery('act','dispMemberAdminGroupList'); location.href = url; } @@ -64,7 +64,7 @@ function completeInsertDeniedID(ret_obj) { alert(message); - var url = location.href.setQuery('act','dispMemberAdminDeniedIDList'); + var url = current_url.setQuery('act','dispMemberAdminDeniedIDList'); location.href = url; } @@ -96,7 +96,7 @@ function completeUpdateJoinForm(ret_obj) { alert(message); - var url = location.href.setQuery('act','dispMemberAdminJoinFormList'); + var url = current_url.setQuery('act','dispMemberAdminJoinFormList'); location.href = url; } @@ -109,7 +109,7 @@ function completeInsertJoinForm(ret_obj) { alert(message); - var url = location.href.setQuery('act','dispMemberAdminJoinFormList'); + var url = current_url.setQuery('act','dispMemberAdminJoinFormList'); location.href = url; } diff --git a/modules/menu/tpl/js/menu_admin.js b/modules/menu/tpl/js/menu_admin.js index 2dcde6456..b243007bc 100644 --- a/modules/menu/tpl/js/menu_admin.js +++ b/modules/menu/tpl/js/menu_admin.js @@ -2,7 +2,7 @@ function completeInsertMenu(ret_obj) { var menu_srl = ret_obj['menu_srl']; alert(ret_obj['message']); - location.href = location.href.setQuery('act','dispMenuAdminManagement').setQuery('menu_srl',menu_srl); + location.href = current_url.setQuery('act','dispMenuAdminManagement').setQuery('menu_srl',menu_srl); } /* 메뉴 삭제 */ @@ -17,7 +17,7 @@ function doDeleteMenu(menu_srl) { function completeDeleteMenu(ret_obj) { var menu_srl = ret_obj['menu_srl']; alert(ret_obj['message']); - location.href = location.href.setQuery('act','dispMenuAdminContent').setQuery('menu_srl',''); + location.href = current_url.setQuery('act','dispMenuAdminContent').setQuery('menu_srl',''); } /* 빈 메뉴 아이템 추가 */ diff --git a/modules/module/tpl/js/module_admin.js b/modules/module/tpl/js/module_admin.js index 3daabda73..78c238138 100644 --- a/modules/module/tpl/js/module_admin.js +++ b/modules/module/tpl/js/module_admin.js @@ -22,7 +22,7 @@ function completeUpdateCategory(ret_obj) { alert(message); - var url = location.href.setQuery('act','dispModuleAdminCategory'); + var url = current_url.setQuery('act','dispModuleAdminCategory'); location.href = url; } diff --git a/modules/page/tpl/js/page_admin.js b/modules/page/tpl/js/page_admin.js index 16ddf95a1..484bcb7ce 100644 --- a/modules/page/tpl/js/page_admin.js +++ b/modules/page/tpl/js/page_admin.js @@ -16,10 +16,10 @@ function completeInsertPage(ret_obj) { var url = ''; if(location.href.getQuery('module')=='admin') { - url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispPageAdminInfo'); + url = current_url.setQuery('module_srl',module_srl).setQuery('act','dispPageAdminInfo'); if(page) url = url.setQuery('page',page); } else { - url = location.href.setQuery('act','').setQuery('module_srl',''); + url = current_url.setQuery('act','').setQuery('module_srl',''); } location.href = url; @@ -33,7 +33,7 @@ function completeDeletePage(ret_obj) { var page = ret_obj['page']; alert(message); - var url = location.href.setQuery('act','dispPageAdminContent'); + var url = current_url.setQuery('act','dispPageAdminContent'); if(page) url = url.setQuery('page',page); location.href = url; @@ -43,5 +43,5 @@ function completeDeletePage(ret_obj) { function doChangeCategory(sel_obj, url) { var module_category_srl = sel_obj.options[sel_obj.selectedIndex].value; if(!module_category_srl) location.href=url; - else location.href = location.href.setQuery('module_category_srl',module_category_srl); + else location.href = current_url.setQuery('module_category_srl',module_category_srl); } diff --git a/plugins/login_info/skins/default/js/login.js b/plugins/login_info/skins/default/js/login.js index 317f2e44c..7ba0a16e6 100644 --- a/plugins/login_info/skins/default/js/login.js +++ b/plugins/login_info/skins/default/js/login.js @@ -22,8 +22,8 @@ function completeLogin(ret_obj, response_tags, params, fo_obj) { xSetCookie('user_id', fo_obj.user_id.value, expire); } - var url = location.href.setQuery('act',''); - location.href = location.href.setQuery('act',''); + var url = current_url.setQuery('act',''); + location.href = url; }