diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index 6262bc14fd3..a53af6bcfcf 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -1,16 +1,28 @@ -$(document).ready(function() { +$(document).ready(function() { + function expandFirstLevelMenu($firstLevelMenu, $secondLevelMenu) { + $firstLevelMenu.find("#expandable_first_level_arrow").removeClass("close").addClass("open"); + $firstLevelMenu.addClass("highlighted"); + $expandedFirstLevelMenu = $firstLevelMenu; + $secondLevelMenu.show(); + $expandedSecondLevelMenu = $secondLevelMenu; + } + + function collapseFirstLevelMenu($firstLevelMenu, $secondLevelMenu) { + $firstLevelMenu.find("#expandable_first_level_arrow").removeClass("open").addClass("close"); + $firstLevelMenu.removeClass("highlighted"); + $secondLevelMenu.hide(); + } + $("#leftmenu_container").find("#expandable_first_level").bind("click", function(event) { var $firstLevelMenu = $(this); var $secondLevelMenu = $firstLevelMenu.siblings(".leftmenu_expandedbox"); if($secondLevelMenu.css("display") == "none") { - $firstLevelMenu.find("#expandable_first_level_arrow").removeClass("close").addClass("open"); - $firstLevelMenu.addClass("highlighted"); - $secondLevelMenu.show(); + if($expandedFirstLevelMenu != null && $expandedSecondLevelMenu != null) //collapse other expanded menu if there is. + collapseFirstLevelMenu($expandedFirstLevelMenu, $expandedSecondLevelMenu); + expandFirstLevelMenu($firstLevelMenu, $secondLevelMenu); } else { - $firstLevelMenu.find("#expandable_first_level_arrow").removeClass("open").addClass("close"); - $firstLevelMenu.removeClass("highlighted"); - $secondLevelMenu.hide(); + collapseFirstLevelMenu($firstLevelMenu, $secondLevelMenu); } return false; }); diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index 201d2eda437..0d931dadc10 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -504,9 +504,9 @@ function selectLeftMenu($menuToSelect) { $selectedLeftMenu = $menuToSelect; } +var $expandedFirstLevelMenu, $expandedSecondLevelMenu; -var selected_midmenu_id = null; - +var selected_midmenu_id = null; function hideMiddleMenu() { $("#middle_menu, #search_panel, #middle_menu_pagination").hide(); $("#right_panel").removeClass("main_contentarea").addClass("main_contentarea_dashboard");