From 3a54c145a2b78b7f0ab85934e19b80b443681973 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 24 Jan 2011 14:13:39 -0800
Subject: [PATCH] bug 7357: IP Address page - clean subgrid container when a
 tab is clicked.

---
 ui/scripts/cloud.core.instance.js  |  8 ++++--
 ui/scripts/cloud.core.ipaddress.js | 46 +++++++++++++++++++++++-------
 ui/scripts/cloud.core.volume.js    |  8 ++++--
 3 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index 992f34052a5..587e4b90ac2 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -1634,12 +1634,16 @@ function vmToRightPanel($midmenuItem1) {
   
 function vmJsonToDetailsTab(){  
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-	if ($midmenuItem1 == null)
+	if ($midmenuItem1 == null) {
+	    vmJsonClearDetailsTab();   
 	    return;	 
+	}
 	    
 	var jsonObj = $midmenuItem1.data("jsonObj");    
-	if(jsonObj == null)
+	if(jsonObj == null) {
+	    vmJsonClearDetailsTab();   
 	    return;
+	}
 	
 	var $thisTab = $("#right_panel_content").find("#tab_content_details");     
 	$thisTab.find("#tab_container").hide(); 
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 8af40565140..f3e166e8f9a 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -391,12 +391,16 @@ function ipToRightPanel($midmenuItem1) {
 
 function ipJsonToPortForwardingTab() {   
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    if($midmenuItem1 == null)
+    if($midmenuItem1 == null) {
+        ipClearPortForwardingTab();
         return;    
+    }
         
     var ipObj = $midmenuItem1.data("jsonObj");
-    if(ipObj == null)
+    if(ipObj == null) {
+        ipClearPortForwardingTab();
         return;   
+    }
         
     var networkObj = $midmenuItem1.data("networkObj");
       
@@ -446,12 +450,16 @@ function ipJsonToPortForwardingTab() {
 
 function ipJsonToLoadBalancerTab() {
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    if($midmenuItem1 == null)
+    if($midmenuItem1 == null) {
+        ipClearLoadBalancerTab();
         return;
+    }
     
     var ipObj = $midmenuItem1.data("jsonObj");
-    if(ipObj == null)
+    if(ipObj == null) {
+        ipClearLoadBalancerTab();
         return;
+    }
    
     var networkObj = $midmenuItem1.data("networkObj");
    
@@ -574,19 +582,27 @@ function showEnableVPNDialog($thisTab) {
 
 function ipJsonToVPNTab() {
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    if($midmenuItem1 == null)
+    if($midmenuItem1 == null) {
+        ipClearVPNTab();
         return;
+    }
     
     var ipObj = $midmenuItem1.data("jsonObj");
-    if(ipObj == null)
+    if(ipObj == null) {
+        ipClearVPNTab();
         return;
+    }
 	
 	var ipAddress = ipObj.ipaddress;
-	if(ipAddress == null || ipAddress.length == 0)
+	if(ipAddress == null || ipAddress.length == 0) {
+	    ipClearVPNTab();
 	    return;
+	}
 	
 	var $thisTab = $("#right_panel_content").find("#tab_content_vpn");  	
-	
+	$thisTab.find("#tab_spinning_wheel").show();    
+    $thisTab.find("#tab_container").hide();   
+		
 	$.ajax({
         data: createURL("command=listRemoteAccessVpns&publicip="+ipAddress),
         dataType: "json",
@@ -604,6 +620,12 @@ function ipJsonToVPNTab() {
     });    
 }
 
+function ipClearVPNTab() {
+	var $thisTab = $("#right_panel_content").find("#tab_content_vpn");  	
+	showEnableVPNDialog($thisTab);	 	
+	$thisTab.find("#vpn_disabled_msg").hide();
+}
+
 function showVpnUsers(presharedkey, publicip) {
 	var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");	
 	var ipObj = $midmenuItem1.data("jsonObj");
@@ -893,12 +915,16 @@ function ipClearRightPanel() {
 //***** Details tab (begin) ****************************************************************************************************************
 function ipJsonToDetailsTab() {  
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    if($midmenuItem1 == null)
+    if($midmenuItem1 == null) {
+        ipClearDetailsTab()
         return;
+    }
     
     var ipObj = $midmenuItem1.data("jsonObj");
-    if(ipObj == null)
+    if(ipObj == null) {
+        ipClearDetailsTab()
         return;
+    }
     
     var networkObj = $midmenuItem1.data("networkObj");
     
diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js
index 2961edb5bcc..9e4eed68167 100644
--- a/ui/scripts/cloud.core.volume.js
+++ b/ui/scripts/cloud.core.volume.js
@@ -337,12 +337,16 @@ function volumeToRightPanel($midmenuItem1) {
  
 function volumeJsonToDetailsTab(){  
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    if($midmenuItem1 == null)
+    if($midmenuItem1 == null) {
+        volumeJsonClearDetailsTab();   
         return;
+    }
     
     var jsonObj = $midmenuItem1.data("jsonObj");
-    if(jsonObj == null)
+    if(jsonObj == null) {
+        volumeJsonClearDetailsTab();   
         return;
+    }
      
     var $thisTab = $("#right_panel_content #tab_content_details");      
     $thisTab.find("#tab_container").hide();