From ce4ad3993ad8d75a398db573fe4e5d07897d71fe Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 16 Dec 2010 19:58:22 -0800
Subject: [PATCH] domain tree - clicking between domain treenode won't reload
 domain.jsp.

---
 ui/jsp/domain.jsp               |  3 +--
 ui/scripts/cloud.core.domain.js |  9 ++-------
 ui/scripts/cloud.core.init.js   | 11 +++++------
 ui/scripts/cloud.core.js        |  8 ++++----
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/ui/jsp/domain.jsp b/ui/jsp/domain.jsp
index c23afe1460f..09e60163b97 100644
--- a/ui/jsp/domain.jsp
+++ b/ui/jsp/domain.jsp
@@ -39,8 +39,7 @@
                    <p>Loading &hellip;</p>    
               </div>               
         </div>
-        <div class="grid_container" id="domain_grid_container">        
-        
+        <div class="grid_container">    
         	<div class="grid_header">
             	<div id="grid_header_title" class="grid_header_title">(title)</div>
                 <div id="action_link" class="grid_actionbox">
diff --git a/ui/scripts/cloud.core.domain.js b/ui/scripts/cloud.core.domain.js
index e9e7ef6db12..8bbd4f972b3 100644
--- a/ui/scripts/cloud.core.domain.js
+++ b/ui/scripts/cloud.core.domain.js
@@ -210,15 +210,10 @@ function initAddDomainDialog() {
 }
 
 function domainToRightPanel($leftmenuItem1) {  
-    if($("#domain_grid_container").length == 0) { //domain.jsp is not loaded in right panel        
+    if(currentRightPanelJSP != "jsp/domain.jsp") {     
         $("#right_panel").load("jsp/domain.jsp", function(){     
+            currentRightPanelJSP = "jsp/domain.jsp";
             afterLoadDomainJSP();
-           
-            //switch between different tabs
-            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);       
-                           
 			domainToRightPanel2($leftmenuItem1);       
 		});        
     }
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index f9583e9e782..f112e173759 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -140,8 +140,9 @@ $(document).ready(function() {
 		    $("#right_panel").data("onRefreshFn", function() {
 		        $("#leftmenu_global_setting").click();
 		    });
-		    if ("jsp/globalsetting.jsp" != currentContext) {
-				$("#right_panel").load("jsp/globalsetting.jsp", function(){     
+		    if (currentRightPanelJSP != "jsp/globalsetting.jsp") {
+				$("#right_panel").load("jsp/globalsetting.jsp", function(){   
+				    currentRightPanelJSP = "jsp/globalsetting.jsp";  
 					var $actionLink = $("#right_panel_content #tab_content_details #action_link");
 					$actionLink.bind("mouseover", function(event) {	    
 						$(this).find("#action_menu").show();    
@@ -150,10 +151,8 @@ $(document).ready(function() {
 					$actionLink.bind("mouseout", function(event) {       
 						$(this).find("#action_menu").hide();    
 						return false;
-					});	   
-								  
-					afterLoadGlobalSettingJSP();
-					currentContext = "jsp/globalsetting.jsp";
+					});	   								  
+					afterLoadGlobalSettingJSP();					
 				});    
 			} else {
 				populateGlobalSettingGrid();
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 94e4de0df30..0745f2b8ccf 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -997,7 +997,7 @@ function listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, json
 }
 
 var currentLeftMenuId;
-var currentContext = null;
+var currentRightPanelJSP = null;
 function listMidMenuItems(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSPFn, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, leftmenuId) { 
 	clearMiddleMenu();
 	showMiddleMenu();	
@@ -1009,8 +1009,9 @@ function listMidMenuItems(commandString, getSearchParamsFn, jsonResponse1, jsonR
 	    $("#"+leftmenuId).click();
 	});
 
-	if (rightPanelJSP != currentContext) {
+	if (currentRightPanelJSP != rightPanelJSP) {
 		$("#right_panel").load(rightPanelJSP, function(){     
+		    currentRightPanelJSP = rightPanelJSP;
 			var $actionLink = $("#right_panel_content #tab_content_details #action_link");
 			$actionLink.bind("mouseover", function(event) {	    
 				$(this).find("#action_menu").show();    
@@ -1023,8 +1024,7 @@ function listMidMenuItems(commandString, getSearchParamsFn, jsonResponse1, jsonR
 			removeDialogs();
 			clearAddButtonsOnTop();
 			afterLoadRightPanelJSPFn();                
-			listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, 1);            
-			currentContext = rightPanelJSP;
+			listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, 1);   			
 		});     
 	} else {
 		listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, 1);