From 4fa53720c63282bd0b9731f2c8d56bb5cbec771f Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 5 Oct 2010 14:22:10 -0700
Subject: [PATCH] new UI - add shared function
 enableMultipleSelectionInMiddleMenu(),
 disableMultipleSelectionInMiddleMenu().

---
 ui/new/scripts/cloud.core2.init.js     |  7 +++---
 ui/new/scripts/cloud.core2.instance.js | 29 +-----------------------
 ui/new/scripts/cloud.core2.js          | 31 +++++++++++++++++++++++++-
 ui/scripts/cloud.core.instances.js     | 11 +--------
 4 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index 81400b1dc3a..cf3274af427 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -25,7 +25,7 @@ $(document).ready(function() {
             $(this).addClass("selected");
             
             showMiddleMenu();
-            $("#midmenu_container").selectable("destroy"); //Most pages don't need multiple selection in middle menu.
+            disableMultipleSelectionInMidMenu();
             
             clearLeftMenu();
             clearMiddleMenu();
@@ -88,7 +88,8 @@ $(document).ready(function() {
         
     $("#leftmenu_instance_group_header").bind("click", function(event) {  
         showMiddleMenu();
-        clearMiddleMenu(); 
+        clearMiddleMenu();          
+        enableMultipleSelectionInMiddleMenu();  //multiple-selection is needeed for actions like start VM, stop VM, reboot VM.
         var $arrowIcon = $(this).find("#arrow_icon");        
         clickInstanceGroupHeader($arrowIcon);
         return false;
@@ -109,7 +110,7 @@ $(document).ready(function() {
         $(this).addClass("selected");
         
         showMiddleMenuWithoutSearch();
-        $("#midmenu_container").selectable("destroy"); //Most pages don't need multiple selection in middle menu.
+        disableMultipleSelectionInMidMenu();
         
         clearLeftMenu();
         clearMiddleMenu();
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index e796a6dddd1..1051f059a26 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -1,31 +1,4 @@
-function clickInstanceGroupHeader($arrowIcon) {       
-    //midmenu needs multiple-selection for actions like start VM, stop VM, reboot VM.
-    $("#midmenu_container").selectable({
-        selecting: function(event, ui) {	 	                               
-            if(ui.selecting.id.indexOf("midmenuItem") != -1) {                     
-                var $midmenuItem1 = $("#"+ui.selecting.id);
-                if($midmenuItem1.find("#content").hasClass("inaction") == false) { //only items not in action are allowed to be selected
-                    var id =$midmenuItem1.data("jsonObj").id;                
-                    selectedItemsInMidMenu[id] = $midmenuItem1; 
-                    $midmenuItem1.find("#content").addClass("selected");   
-                }                               
-                clearRightPanel();      
-                var toRightPanelFn = $midmenuItem1.data("toRightPanelFn");
-                toRightPanelFn($midmenuItem1);	          
-            }                                             
-        },
-        unselecting: function(event, ui) {
-            if(ui.unselecting.id.indexOf("midmenuItem") != -1) {                     
-                var $midmenuItem1 = $("#"+ui.unselecting.id);
-                var id = $midmenuItem1.data("jsonObj").id;
-                if(id in selectedItemsInMidMenu) {                    
-                    delete selectedItemsInMidMenu[id];
-                    $midmenuItem1.find("#content").removeClass("selected"); 
-                }
-            }             
-        }
-    });    
-       
+function clickInstanceGroupHeader($arrowIcon) { 
     $("#midmenu_add_link").show(); 
     
 	if($arrowIcon.hasClass("close") == true) {
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index e3f09c1503a..4bc87b26879 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -762,7 +762,36 @@ function initDialog(elementId, width1) {
     }
 } 
 
-
+function disableMultipleSelectionInMidMenu() {
+    $("#midmenu_container").selectable("destroy"); //Most pages don't need multiple selection in middle menu.
+}
+function enableMultipleSelectionInMiddleMenu() {
+    $("#midmenu_container").selectable({
+        selecting: function(event, ui) {	 	                               
+            if(ui.selecting.id.indexOf("midmenuItem") != -1) {                     
+                var $midmenuItem1 = $("#"+ui.selecting.id);
+                if($midmenuItem1.find("#content").hasClass("inaction") == false) { //only items not in action are allowed to be selected
+                    var id =$midmenuItem1.data("jsonObj").id;                
+                    selectedItemsInMidMenu[id] = $midmenuItem1; 
+                    $midmenuItem1.find("#content").addClass("selected");   
+                }                               
+                clearRightPanel();      
+                var toRightPanelFn = $midmenuItem1.data("toRightPanelFn");
+                toRightPanelFn($midmenuItem1);	          
+            }                                             
+        },
+        unselecting: function(event, ui) {
+            if(ui.unselecting.id.indexOf("midmenuItem") != -1) {                     
+                var $midmenuItem1 = $("#"+ui.unselecting.id);
+                var id = $midmenuItem1.data("jsonObj").id;
+                if(id in selectedItemsInMidMenu) {                    
+                    delete selectedItemsInMidMenu[id];
+                    $midmenuItem1.find("#content").removeClass("selected"); 
+                }
+            }             
+        }
+    });    
+}
 
 
 
diff --git a/ui/scripts/cloud.core.instances.js b/ui/scripts/cloud.core.instances.js
index f012ffaa8f5..5c773410c88 100644
--- a/ui/scripts/cloud.core.instances.js
+++ b/ui/scripts/cloud.core.instances.js
@@ -1062,16 +1062,7 @@ function showInstancesTab(p_domainId, p_account) {
 					link.data("expanded", false);
 				}
 				break;			    
-			case "vm_actions" :
-			    //fix for zIndex bug of IE7                 
-                vmInstance.find('#vm_rows').each(function() {
-                    $(this).css("z-index", "1");
-                });
-
-                vmInstance.find('#vm_actions_container').each(function() {
-                    $(this).css("z-ndex", "2");
-                });
-
+			case "vm_actions" :			    
 				vmInstance.find("#vm_actions_container").slideDown("fast");
 				break;
 			case "vm_actions_close" :