From 49d40df2fecf3f0c00e6e7b8e95e666d3608b786 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 29 Nov 2010 14:05:56 -0800 Subject: [PATCH] domain page - implement refresh button. --- ui/scripts/cloud.core.domain.js | 8 -------- ui/scripts/cloud.core.init.js | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/ui/scripts/cloud.core.domain.js b/ui/scripts/cloud.core.domain.js index 1c3f60a16dc..d02e341e92c 100644 --- a/ui/scripts/cloud.core.domain.js +++ b/ui/scripts/cloud.core.domain.js @@ -21,14 +21,6 @@ var defaultRootLevel = 0; var childParentMap = {}; //map childDomainId to parentDomainId var domainIdNameMap = {}; //map domainId to domainName -function afterLoadDomainJSP() { - //***** switch between different tabs (begin) ******************************************************************** - var tabArray = [$("#tab_details"), $("#tab_resource_limits"), $("#tab_admin_account")]; - var tabContentArray = [$("#tab_content_details"), $("#tab_content_resource_limits"), $("#tab_content_admin_account")]; - switchBetweenDifferentTabs(tabArray, tabContentArray); - //***** switch between different tabs (end) ********************************************************************** -} - function refreshWholeTree(rootDomainId, rootLevel) { drawRootNode(rootDomainId); drawTree(rootDomainId, (rootLevel+1), $("#domain_children_container_"+rootDomainId)); //draw the whole tree (under root node) diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js index 6368670bd67..a68cddcd7da 100644 --- a/ui/scripts/cloud.core.init.js +++ b/ui/scripts/cloud.core.init.js @@ -43,14 +43,17 @@ $(document).ready(function() { }); $("#leftmenu_domain").bind("click", function(event) { - if (selectLeftMenu($(this), true)) { - hideMiddleMenu(); - disableMultipleSelectionInMidMenu(); - clearMiddleMenu(); - - bindEventHandlerToDomainTreeNode(); - refreshWholeTree(g_domainid, defaultRootLevel); - } + selectLeftMenu($(this), true); + + hideMiddleMenu(); + disableMultipleSelectionInMidMenu(); + clearMiddleMenu(); + + $("#right_panel").data("leftmenuId", "leftmenu_domain"); + + bindEventHandlerToDomainTreeNode(); + refreshWholeTree(g_domainid, defaultRootLevel); + return false; }); $("#leftmenu_account").bind("click", function(event) {