diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index b7f0b0ff6..78535245b 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -127,26 +127,26 @@ jQuery(function($){
});
var parentIndex = $xGnb_li.find('>ul>li.active_').closest('li.active').attr('data-index');
$xGnb_li.find('>ul>li.active_').clone().addClass('active').attr('data-index', parentIndex).prependTo('#gnbNav').find('>a').prepend('');
- // Index
// GNB Click toggle
$xGnb_li.find('>a').click(function(){
var $parent = $(this).parent('li');
var hasOpen = $parent.hasClass('open');
var hasActive = $parent.hasClass('active');
var hasList = $parent.find('>ul').length >= 1;
+ var hasWide = $xBody.hasClass('wide');
function openGNB(){
$xBody.removeClass('wide');
reflow();
}
- if(!hasOpen && !hasActive && hasList){
+ if(!hasOpen && !hasActive && hasList){ // Down to open
$parent.addClass('open').find('>ul').slideDown(100);
openGNB();
return false;
- } else if(hasOpen && !hasActive && hasList){
+ } else if(hasOpen && !hasActive && hasList && !hasWide){ // Up to close
$parent.removeClass('open').find('>ul').slideUp(100);
openGNB();
return false;
- } else if($xBody.hasClass('wide') && !hasList || hasActive){
+ } else if(hasWide && !hasList || hasActive || hasWide && hasOpen){ // Right to open
openGNB();
return false;
}
diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js
index 3cb7b276d..6db85a585 100644
--- a/modules/admin/tpl/js/admin.min.js
+++ b/modules/admin/tpl/js/admin.min.js
@@ -1 +1 @@
-function showWaitingFogLayer(){var a=jQuery('');a.height(jQuery(window).height());jQuery(".wfsr").wrap('
').before(a);}function hideWaitingFogLayer(){jQuery(".wfsr").prev("span").remove();jQuery(".wfsr").unwrap();}function doInstallModule(a){var b=new Array();b.module_name=a;exec_xml("install","procInstallAdminInstall",b,completeInstallModule);showWaitingFogLayer();}function doUpdateModule(a){var b=new Array();b.module_name=a;exec_xml("install","procInstallAdminUpdate",b,completeInstallModule);showWaitingFogLayer();}function completeInstallModule(a){alert(a.message);location.reload();}jQuery(function(b){window.scrollTo(0,0);b(".x .skipNav>a").click(function(){b(b(this).attr("href")).attr("tabindex","0").css("outline","0").focus();});b(document.body).on("click",".x [data-toggle]",function(){var g=b(this);var f=b(g.attr("data-toggle"));var h="a,input,button,textarea,select";f.toggle();if(f.is(":visible")&&!f.find(h).length){f.attr("tabindex","0").not(":disabled").focus();}else{if(f.is(":visible")&&f.find(h).length){f.find(h).not(":disabled").eq(0).focus();}else{g.focus();}}return false;});b(document.body).on("click",".x [data-show]",function(){b(b(this).attr("data-show")).show().attr("tabindex","0").focus();return false;});b(document.body).on("click",".x [data-hide]",function(){var f=b(this);b(f.attr("data-hide")).hide();f.focus();return false;});b.fn.xeTabbable=function(){b(this).each(function(){var f=b(this);f.find(">.x_nav-tabs>li>a").each(function(g){b(this).attr("data-index",g+1);});f.find(">.x_tab-content>.x_tab-pane").each(function(g){b(this).attr("data-index",g+1);});});b('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide();};b(".x .x_tabbable").xeTabbable();b(document.body).on("click",'.x .x_nav-tabs>li>a[href*="#"]',function(){var f=b(this);if(f.parent("li").hasClass("x_disabled")){return false;}f.parent("li").addClass("x_active").siblings().removeClass("x_active");f.closest(".x_nav-tabs").next(".x_tab-content").find(">.x_tab-pane").eq(f.attr("data-index")-1).addClass("x_active").show().siblings(".x_tab-pane").removeClass("x_active").hide();b(this).parents(".x_tabbable").trigger("tab_change",[parseInt(b(this).attr("data-index"))-1,b(this)]);return false;});function a(){var h=b(".x>.xin>.body");var g=h.find(">.gnb");var f=h.children("#content.content");f.width("99.99%");setTimeout(function(){f.removeAttr("style");if(g.height()>f.height()){f.height(g.height());}},100);}b.fn.gnb=function(){var m=b(".x>.xin>.body");var j=m.find(">.gnb");var l=j.find(">ul>li");var h=new Date();h.setTime(h.getTime()+60*60*24*356);l.find(">a").prepend("");l.each(function(n){b(this).attr("data-index",n+1);});var k=l.find(">ul>li.active_").closest("li.active").attr("data-index");l.find(">ul>li.active_").clone().addClass("active").attr("data-index",k).prependTo("#gnbNav").find(">a").prepend("");l.find(">a").click(function(){var p=b(this).parent("li");var q=p.hasClass("open");var o=p.hasClass("active");var n=p.find(">ul").length>=1;function r(){m.removeClass("wide");a();}if(!q&&!o&&n){p.addClass("open").find(">ul").slideDown(100);r();return false;}else{if(q&&!o&&n){p.removeClass("open").find(">ul").slideUp(100);r();return false;}else{if(m.hasClass("wide")&&!n||o){r();return false;}}}});j.find('>a[href="#gnbNav"]').click(function(){b(this).parent(".gnb").toggleClass("open");m.toggleClass("wide");if(b(window).width()<=980&&!j.hasClass("open")){b("#gnbNav").removeClass("ex");}a();if(b(this).parent(".gnb").hasClass("open")){setCookie("__xe_admin_gnb_status","open",h);}else{setCookie("__xe_admin_gnb_status","close",h);}return false;});j.prepend('').append('');j.find(">.close").focus(function(){m.addClass("wide");a();});j.find(".exMenu>button").click(function(){b("#gnbNav").toggleClass("ex");a();if(b("#gnbNav").hasClass("ex")){setCookie("__xe_admin_gnb_ex_status","open",h);}else{setCookie("__xe_admin_gnb_ex_status","close",h);}});var f=getCookie("__xe_admin_gnb_status");if(f){setCookie("__xe_admin_gnb_status",f,h);}var g=getCookie("__xe_admin_gnb_ex_status");if(g){setCookie("__xe_admin_gnb_xe_status",g,h);}};b(".gnb").gnb();b(".x #lang").mouseleave(function(){b(this).hide();}).focusout(function(){var f=b(this);setTimeout(function(){if(!f.find("a:focus").length){f.mouseleave();}},500);});b('.x th>input[type="checkbox"]').change(function(){var g=b(this),f=g.data("name");g.closest("table").find("input:checkbox").filter(function(){var h=b(this);return !h.prop("disabled")&&((h.attr("name")==f)||(h.data("name")==f));}).prop("checked",g.prop("checked")).end().end().trigger("update.checkbox",[f,this.checked]);});b(document.body).on("click",".x .x_pagination .x_disabled, .x .x_pagination .x_active",function(){return false;});if(b(".section").length>1){var d=b(".x .section").find(">h1:first");d.append('');b(".x .section.collapse>h1>.snToggle").removeClass("x_icon-chevron-up").addClass("x_icon-chevron-down");d.find(">.snToggle").click(function(){var g=b(this);var f=g.closest(".section");if(!f.hasClass("collapse")){f.addClass("collapse").children("h1:first").siblings().hide();g.removeClass("x_icon-chevron-up").addClass("x_icon-chevron-down");}else{f.removeClass("collapse").children("h1:first").siblings().show();g.removeClass("x_icon-chevron-down").addClass("x_icon-chevron-up");}a();});}var e=b(".x .x_alert");e.prepend('');e.children(".x_close").click(function(){b(this).parent(".x_alert").hide();});b(".x .x_btn").click(function(){if(b(this).hasClass("x_disabled")){return false;}});b.fn.vr=function(){this.each(function(){var f=b(this);if(f.text()=="|"){f.addClass("vr").filter(":first-child, :last-child").remove();}});};b(".x i").vr();b.fn.labelMaker=function(){this.each(function(h){h=h+1;var k=b(this);var g="input, textarea, select";var f=":radio, :checkbox";var l="[id]";var j="i"+h;if(k.next(g).filter(l).not(f).length){k.attr("for",k.next().attr("id"));}else{if(k.next(g).not(l).not(f).length){k.attr("for",j).next().attr("id",j);}else{if(k.prev(f).filter(l).length){k.attr("for",k.prev().attr("id"));}else{if(k.prev(f).not(l).length){k.attr("for",j).prev().attr("id",j);}else{if(k.children(g).filter(l).length){k.attr("for",k.children(g).filter(l).eq(0).attr("id"));}else{if(k.children(g).not(l).length){k.attr("for",j).children(g).not(l).eq(0).attr("id",j);}}}}}}});};b("label:not([for])").labelMaker();b.fn.checkToggle=function(){function f(){setTimeout(function(){b(":checked").parent("label").addClass("checked");b(':not(":checked")').parent("label").removeClass("checked");},0);}this.change(f);f();};b(":radio, :checkbox").checkToggle();b.fn.fileTypeOverlap=function(){this.each(function(){var g=b(this);g.wrap('').before('