From 1ecfdae8f0a3bc9eaa807cd2b9802f44ac7d194c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 6 Oct 2010 12:05:17 -0700
Subject: [PATCH] new UI - middle menu actions - If Cancel button in dialog box
 is clicked, remove highlight in middle menu.

---
 ui/new/scripts/cloud.core2.instance.js |  8 ++++++++
 ui/new/scripts/cloud.core2.js          | 13 +++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index e8886bae5b8..b0abfa99ee7 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -794,6 +794,7 @@ function doAttachISO($t, selectedItemsInMidMenu, vmListAPIMap) {
 		}, 
 		"Cancel": function() { 
 			$(this).dialog("close"); 
+			removeHighlightInMiddleMenu(selectedItemsInMidMenu);
 		} 
 	}).dialog("open");
 }
@@ -810,6 +811,7 @@ function doDetachISO($t, selectedItemsInMidMenu, vmListAPIMap) {
 		}, 
 		"Cancel": function() { 
 			$(this).dialog("close"); 
+			removeHighlightInMiddleMenu(selectedItemsInMidMenu);
 		} 
 	}).dialog("open");
 }
@@ -837,6 +839,7 @@ function doResetPassword($t, selectedItemsInMidMenu, vmListAPIMap) {
 		}, 
 		"No": function() { 
 			$(this).dialog("close"); 
+			removeHighlightInMiddleMenu(selectedItemsInMidMenu);
 		} 
 	}).dialog("open");
 }
@@ -917,6 +920,7 @@ function doChangeName($t, selectedItemsInMidMenu, vmListAPIMap) {
 		}, 
 		"Cancel": function() { 
 			$(this).dialog("close"); 
+			removeHighlightInMiddleMenu(selectedItemsInMidMenu);
 		} 
 	}).dialog("open");
 }
@@ -980,6 +984,7 @@ function doChangeService($t, selectedItemsInMidMenu, vmListAPIMap) {
 		}, 
 		"Cancel": function() { 
 			$(this).dialog("close"); 
+			removeHighlightInMiddleMenu(selectedItemsInMidMenu);
 		} 
 	}).dialog("open");
 }
@@ -1006,6 +1011,7 @@ function doChangeGroup($t, selectedItemsInMidMenu, vmListAPIMap) {
 		}, 
 		"Cancel": function() { 
 			$(this).dialog("close"); 
+			removeHighlightInMiddleMenu(selectedItemsInMidMenu);
 		} 
 	}).dialog("open");	
 }
@@ -1024,6 +1030,7 @@ function doEnableHA($t, selectedItemsInMidMenu, vmListAPIMap) {
 		}, 
 		"Cancel": function() { 
 			$(this).dialog("close"); 
+			removeHighlightInMiddleMenu(selectedItemsInMidMenu);
 		} 
 	}).dialog("open");
 }
@@ -1042,6 +1049,7 @@ function doDisableHA($t, selectedItemsInMidMenu, vmListAPIMap) {
 		}, 
 		"Cancel": function() { 
 			$(this).dialog("close"); 
+			removeHighlightInMiddleMenu(selectedItemsInMidMenu);
 		} 
 	}).dialog("open");
 }
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index eeccbaae93c..9400417286c 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -215,12 +215,25 @@ function buildActionLinkForMidMenu(label, actionMap, $actionMenu, listAPIMap) {
         }
         else {
             dialogBeforeActionFn($actionLink, selectedItemsInMidMenu, listAPIMap);	
+            
         }        
         selectedItemsInMidMenu = {}; //clear selected items for action	                          
         return false;
     });  
 } 
 
+/*
+If Cancel button in dialog is clicked, action won't preceed. 
+i.e. doActionForMidMenu() won't get called => highlight won't be removd from middle menu. 
+So, we need to remove highlight here. Otherwise, it won't be consistent of selectedItemsInMidMenu which will be emptied soon.
+*/
+function removeHighlightInMiddleMenu(selectedItemsInMidMenu) {
+    for(var id in selectedItemsInMidMenu) {
+        var $midmenuItem = $("#midmenuItem_"+id);	
+        $midmenuItem.find("#content").removeClass("selected");
+    }
+}
+
 function doActionForMidMenu(id, $actionLink, apiCommand, listAPIMap) {   
     var label = $actionLink.data("label");			           
     var isAsyncJob = $actionLink.data("isAsyncJob");