From fbd2e32882eeef5c652cc915a0120d61a118c1c4 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 13 Dec 2010 09:53:43 -0800
Subject: [PATCH] Optimize afterAddingMidMenuItem() - do not need to pay extra
 parameter hasMultipleSelectionSubContainer.

---
 ui/scripts/cloud.core.instance.js | 4 ++--
 ui/scripts/cloud.core.js          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index 88c3c59c8b5..717ea092468 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -1009,7 +1009,7 @@ function initVMWizard() {
 				                            
 				                            if (item.passwordenabled == true) {							                                									        
 										        var extraMessage = "New password: " + item.password;
-										        afterAddingMidMenuItem($midmenuItem1, true, extraMessage, true);
+										        afterAddingMidMenuItem($midmenuItem1, true, extraMessage);
 										        var afterActionInfo = "Instance " + getVmName(item.name, item.displayname) + " has been created successfully.  New password is: " + item.password;
 										        $midmenuItem1.data("afterActionInfo", afterActionInfo); 
 										        
@@ -1022,7 +1022,7 @@ function initVMWizard() {
 	                                            }).dialog("open");											        
 									        } 	
 									        else {
-									            afterAddingMidMenuItem($midmenuItem1, true, null, true);
+									            afterAddingMidMenuItem($midmenuItem1, true, null);
 									        }							                        
 									    } else if (result.jobstatus == 2) {
 										    // Failed										    
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 64006709def..67167fe1b2f 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -667,7 +667,7 @@ function beforeAddingMidMenuItem() {
 	$("#midmenu_container").append($midmenuItem1.show());
 	return $midmenuItem1;
 }
-function afterAddingMidMenuItem($midmenuItem1, isSuccessful, extraMessage, hasMultipleSelectionSubContainer) {
+function afterAddingMidMenuItem($midmenuItem1, isSuccessful, extraMessage) {
     $midmenuItem1.find("#content").removeClass("inaction"); 
 	$midmenuItem1.find("#spinning_wheel").hide();	
 
@@ -676,7 +676,7 @@ function afterAddingMidMenuItem($midmenuItem1, isSuccessful, extraMessage, hasMu
 	    $midmenuItem1.data("afterActionInfo", ("Adding succeeded.")); 
 	    
 	    var $container = $("#midmenu_container");
-	    if(hasMultipleSelectionSubContainer) {
+	    if($("#midmenu_container").find("#multiple_selection_sub_container").length > 0) {
 	        $container = $("#midmenu_container").find("#multiple_selection_sub_container");
 	        $midmenuItem1.appendTo("#midmenu_container #multiple_selection_sub_container"); 
 	    }