new UI - Add Zone Pod Wizard - hide spinning wheel after all of 3 API calls have finished.

Jessica Wang · Jessica Wang · commit f2cbdb99bfdd · 2010-11-11T10:38:36.000-08:00
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
@@ -502,9 +502,8 @@ function addZoneWizardSubmit($thisWizard) {
 	    dataType: "json",
 	    async: false,
 	    success: function(json) {	
-	        afterActionMsg += "Zone was created successfully<br>";	     	 
-	        $thisWizard.find("#spinning_wheel").hide();
-	        	        			        
+	        afterActionMsg += "Zone was created successfully<br><br>";	     	 
+	       	        	        			        
 	        $zoneNode = $("#leftmenu_zone_node_template").clone(true); 			            			   
             var $zoneTree = $("#leftmenu_zone_tree").find("#tree_container");		     			
             $zoneTree.prepend($zoneNode);	
@@ -517,8 +516,7 @@ function addZoneWizardSubmit($thisWizard) {
 	    },
         error: function(XMLHttpResponse) {            
 			handleError(XMLHttpResponse, function() {
-				afterActionMsg += ("Failed to create zone. " + parseXMLHttpResponse(XMLHttpResponse) + "<br>");
-				$thisWizard.find("#spinning_wheel").hide();
+				afterActionMsg += ("Failed to create zone. " + parseXMLHttpResponse(XMLHttpResponse) + "<br><br>");				
 			});
         }
     });
@@ -544,8 +542,7 @@ function addZoneWizardSubmit($thisWizard) {
 	        dataType: "json",
 	        async: false,
 	        success: function(json) {
-	            afterActionMsg += "Pod was created successfully<br>";
-	            $thisWizard.find("#spinning_wheel").hide();
+	            afterActionMsg += "Pod was created successfully<br><br>";	            
 	            	            
 	            var item = json.createpodresponse.pod; 	
 	            podId = item.id;		            		            				    
@@ -569,8 +566,7 @@ function addZoneWizardSubmit($thisWizard) {
 	        },
             error: function(XMLHttpResponse) {	
 				handleError(XMLHttpResponse, function() {
-					afterActionMsg += ("Failed to create Pod. " + parseXMLHttpResponse(XMLHttpResponse) + "<br>");
-					$thisWizard.find("#spinning_wheel").hide();
+					afterActionMsg += ("Failed to create Pod. " + parseXMLHttpResponse(XMLHttpResponse) + "<br><br>");					
 				});
             }
         });	
@@ -595,20 +591,21 @@ function addZoneWizardSubmit($thisWizard) {
         $.ajax({
 		    data: createURL("command=createVlanIpRange" + array1.join("")),
 			dataType: "json",
+			async: false,
 			success: function(json) { 
-			    afterActionMsg += "Guest IP range was created successfully<br>";   
+			    afterActionMsg += "Guest IP range was created successfully<br><br>";   
 				var item = json.createvlaniprangeresponse.vlan;
 				vlanId = item.id;				
 			},		   
 		    error: function(XMLHttpResponse) {	
 				handleError(XMLHttpResponse, function() {
-					afterActionMsg += ("Failed to create Guest IP range. " + parseXMLHttpResponse(XMLHttpResponse) + "<br>");
-					$thisWizard.find("#spinning_wheel").hide();
+					afterActionMsg += ("Failed to create Guest IP range. " + parseXMLHttpResponse(XMLHttpResponse) + "<br><br>");					
 				});
             }
 		});		
     }
-        
+    
+    $thisWizard.find("#spinning_wheel").hide();    
     $thisWizard.find("#after_action_message").html(afterActionMsg);	
 }
 
