From 968d0ec382d5449c23b5ea3f5c53c11ce5cf7a59 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 19 Jan 2011 12:54:43 -0800
Subject: [PATCH] bug 7608: zone/pod page- cancel edit mode when clicking on
 different tab or different middle menu item.

---
 ui/scripts/cloud.core.pod.js  | 13 ++++++-------
 ui/scripts/cloud.core.zone.js | 15 +++++++--------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index a99a97fdbf7..4d4899beec7 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -36,6 +36,9 @@
     var afterSwitchFnArray = [podJsonToDetailsTab, podJsonToNetworkTab];
     switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);       
    
+    $readonlyFields  = $("#tab_content_details").find("#name, #netmask, #ipRange, #gateway");
+    $editFields = $("#tab_content_details").find("#name_edit, #netmask_edit, #startIpRange_edit, #endIpRange_edit, #gateway_edit");
+        
 	podJsonToRightPanel($leftmenuItem1);     	
 }
 
@@ -44,7 +47,8 @@ function podJsonToRightPanel($leftmenuItem1) {
     bindAddHostButton($leftmenuItem1); 
     bindAddPrimaryStorageButton($leftmenuItem1);  
            
-    $("#right_panel_content").data("$leftmenuItem1", $leftmenuItem1);  
+    $("#right_panel_content").data("$leftmenuItem1", $leftmenuItem1); 
+    cancelEditMode($("#tab_content_details"));  
     $("#tab_details").click();   
 }
 
@@ -920,17 +924,12 @@ var podActionMap = {
 }
 
 function doEditPod($actionLink, $detailsTab, $midmenuItem1) {       
-    var $readonlyFields  = $detailsTab.find("#name, #netmask, #ipRange, #gateway");
-    var $editFields = $detailsTab.find("#name_edit, #netmask_edit, #startIpRange_edit, #endIpRange_edit, #gateway_edit");
-           
     $readonlyFields.hide();
     $editFields.show();  
     $detailsTab.find("#cancel_button, #save_button").show();
     
     $detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){    
-        $editFields.hide();
-        $readonlyFields.show();   
-        $("#save_button, #cancel_button").hide();       
+        cancelEditMode($detailsTab);     
         return false;
     });
     $detailsTab.find("#save_button").unbind("click").bind("click", function(event){        
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 5dd23e0b06e..bca624bef79 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -35,11 +35,15 @@
     var tabContentArray = [$("#tab_content_details"), $("#tab_content_secondarystorage"), $("#tab_content_network")];      
     var afterSwitchFnArray = [zoneJsonToDetailsTab, zoneJsonToSecondaryStorageTab, zoneJsonToNetworkTab];
     switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray); 
-      
+     
+    $readonlyFields  = $("#tab_content_details").find("#name, #dns1, #dns2, #internaldns1, #internaldns2, #vlan, #guestcidraddress");
+    $editFields = $("#tab_content_details").find("#name_edit, #dns1_edit, #dns2_edit, #internaldns1_edit, #internaldns2_edit, #startvlan_edit, #endvlan_edit, #guestcidraddress_edit");
+           
     zoneRefreshDataBinding();    	
 }
 
-function zoneRefreshDataBinding() {         
+function zoneRefreshDataBinding() {    
+    cancelEditMode($("#tab_content_details"));      
     var $zoneNode = $selectedSubMenu.parent();     
     zoneJsonToRightPanel($zoneNode);		  
 }
@@ -922,17 +926,12 @@ var zoneActionMap = {
 }
 
 function doEditZone($actionLink, $detailsTab, $leftmenuItem1) {       
-    var $readonlyFields  = $detailsTab.find("#name, #dns1, #dns2, #internaldns1, #internaldns2, #vlan, #guestcidraddress");
-    var $editFields = $detailsTab.find("#name_edit, #dns1_edit, #dns2_edit, #internaldns1_edit, #internaldns2_edit, #startvlan_edit, #endvlan_edit, #guestcidraddress_edit");
-           
     $readonlyFields.hide();
     $editFields.show();  
     $detailsTab.find("#cancel_button, #save_button").show();
     
     $detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){    
-        $editFields.hide();
-        $readonlyFields.show();   
-        $("#save_button, #cancel_button").hide();       
+        cancelEditMode($detailsTab);        
         return false;
     });
     $detailsTab.find("#save_button").unbind("click").bind("click", function(event){