diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index 809539896e0..6590a94c20b 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -30,11 +30,12 @@ $(document).ready(function() { // Setup first level navigation $("#leftmenu_dashboard").bind("click", function(event) { - selectLeftMenu($(this)); - hideMiddleMenu(); - $("#right_panel").load("jsp/dashboard.jsp", function(){ - afterLoadDashboardJSP(); - }); + if (selectLeftMenu($(this))) { + hideMiddleMenu(); + $("#right_panel").load("jsp/dashboard.jsp", function(){ + afterLoadDashboardJSP(); + }); + } return false; }); $("#leftmenu_storage").bind("click", function(event) { @@ -50,8 +51,9 @@ $(document).ready(function() { return false; }); $("#leftmenu_account").bind("click", function(event) { - selectLeftMenu($(this)); - listMidMenuItems("listAccounts", "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRightPanel, getMidmenuId, false); + if (selectLeftMenu($(this))) { + listMidMenuItems("listAccounts", "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRightPanel, getMidmenuId, false); + } return false; }); $("#leftmenu_events").bind("click", function(event) { @@ -59,9 +61,28 @@ $(document).ready(function() { return false; }); $("#leftmenu_system").bind("click", function(event) { - selectLeftMenu($(this), true); - if($("#leftmenu_resource").find("#resource_arrow").hasClass("expanded_open") == true) - $("#leftmenu_resource").click(); //if resource menu is open (i.e. zonetree is shown), empty zonetree and close resource menu. + if (selectLeftMenu($(this), true)) { + if($("#leftmenu_resource").find("#resource_arrow").hasClass("expanded_open") == true) + $("#leftmenu_resource").click(); //if resource menu is open (i.e. zonetree is shown), empty zonetree and close resource menu. + } + return false; + }); + + $("#leftmenu_instances").bind("click", function(event) { + instanceBuildSubMenu(); + selectLeftMenu($(this), true); + return false; + }); + + $("#leftmenu_domain").bind("click", function(event) { + if (selectLeftMenu($(this), true)) { + hideMiddleMenu(); + disableMultipleSelectionInMidMenu(); + clearMiddleMenu(); + + bindEventHandlerToDomainTreeNode(); + refreshWholeTree(g_domainid, defaultRootLevel); + } return false; }); @@ -94,24 +115,6 @@ $(document).ready(function() { bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRightPanel, getMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_global_setting"), "listConfigurations", "listconfigurationsresponse", "configuration", "jsp/globalsetting.jsp", afterLoadGlobalSettingJSP, globalSettingToMidmenu, globalSettingToRightPanel, globalSettingGetMidmenuId, false); - $("#leftmenu_instances").bind("click", function(event) { - instanceBuildSubMenu(); - selectLeftMenu($(this), true); - return false; - }); - - $("#leftmenu_domain").bind("click", function(event) { - selectLeftMenu($(this), true); - hideMiddleMenu(); - disableMultipleSelectionInMidMenu(); - clearMiddleMenu(); - - bindEventHandlerToDomainTreeNode(); - refreshWholeTree(g_domainid, defaultRootLevel); - - return false; - }); - $("#leftmenu_resource").bind("click", function(event) { showMiddleMenu(); disableMultipleSelectionInMidMenu(); @@ -140,10 +143,6 @@ $(document).ready(function() { return false; }); - - - - // Prevent the UI from being iframed if the iframe isn't from the same domain. try { if ( top != self && self.location.hostname != top.location.hostname) { diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index 13062744207..08b52df65da 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -606,7 +606,9 @@ function selectLeftMenu($menuToSelect, expandable) { // Close the help link if it's opened $("#help_dropdown_dialog").hide(); $("#help_button").removeClass("selected"); + return true; } + return false; } var $selectedSubMenu;