From 68f8f1ccf7fb09c9be55f72a9833073254c831dc Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 17 Dec 2010 11:47:49 -0800
Subject: [PATCH] Network page - initialize JQuery dialog only when new JSP
 file is being loaded into right panel.

---
 ui/scripts/cloud.core.network.js | 17 ++++++++---------
 ui/scripts/cloud.core.pod.js     |  5 ++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 7b46fc2a207..aa2d42fc637 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -62,6 +62,13 @@ function afterLoadNetworkJSP($leftmenuItem1) {
     var tabContentArray = [$directNetworkPage.find("#tab_content_details"), $directNetworkPage.find("#tab_content_ipallocation")];
     var afterSwitchFnArray = [directNetworkJsonToDetailsTab, directNetworkJsonToIpAllocationTab];
     switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);    
+    
+    //initialize dialog
+    initDialog("dialog_add_iprange_to_publicnetwork");        
+    initDialog("dialog_add_external_firewall");        
+    initDialog("dialog_add_load_balancer");        
+    initDialog("dialog_add_network_for_zone");
+    initDialog("dialog_add_iprange_to_directnetwork");    
      
     networkPopulateMiddleMenu($leftmenuItem1);       
 }
@@ -370,8 +377,6 @@ var publicNetworkLoadBalancerActionMap = {
 function initAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {   
     var jsonObj = $midmenuItem1.data("jsonObj");      
     
-    initDialog("dialog_add_iprange_to_publicnetwork");    
-    
     var $dialogAddIpRangeToPublicNetwork = $("#dialog_add_iprange_to_publicnetwork"); 
          
     //***** binding Event Handler (begin) ******   
@@ -568,8 +573,6 @@ function initAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {
 function initAddExternalFirewallButton($button, $midmenuItem1) {         
     var jsonObj = $midmenuItem1.data("jsonObj");      
     
-    initDialog("dialog_add_external_firewall");    
-    
     var $dialogAddExternalFirewall = $("#dialog_add_external_firewall"); 
           
     $button.show();   
@@ -715,8 +718,6 @@ var publicNetworkIpRangeActionMap = {
 function initAddLoadBalancerButton($button, $midmenuItem1) {         
     var jsonObj = $midmenuItem1.data("jsonObj");      
     
-    initDialog("dialog_add_load_balancer");    
-    
     var $dialogAddLoadBalancer = $("#dialog_add_load_balancer"); 
           
     $button.show();   
@@ -999,8 +1000,6 @@ function initAddNetworkButton($button) {
     if(zoneObj == null)
         return;
     
-    initDialog("dialog_add_network_for_zone");
-    
     var $dialogAddNetworkForZone = $("#dialog_add_network_for_zone"); 
      
     //***** binding Event Handler (begin) ******    
@@ -1197,7 +1196,7 @@ function initAddNetworkButton($button) {
 
 function initAddIpRangeToDirectNetworkButton($button, $midmenuItem1) {   
     var jsonObj = $midmenuItem1.data("jsonObj");       
-    initDialog("dialog_add_iprange_to_directnetwork");        
+        
     var $dialogAddIpRangeToDirectNetwork = $("#dialog_add_iprange_to_directnetwork");     
   
     $dialogAddIpRangeToDirectNetwork.find("#directnetwork_name").text(fromdb(jsonObj.name));
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 81afade31e9..4a14dfa12ff 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -22,6 +22,7 @@
     initDialog("dialog_add_external_cluster");
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");
+    initDialog("dialog_add_vlan_for_pod");
     
     // if hypervisor is KVM, limit the server option to NFS for now
     if (getHypervisorType() == 'kvm') 
@@ -655,9 +656,7 @@ function initAddPrimaryStorageButton($button, currentPageInRightPanel, $leftmenu
     });             
 }
 
-function initAddPodVLANButton($button, $leftmenuItem1) {
-    initDialog("dialog_add_vlan_for_pod");
-
+function initAddPodVLANButton($button, $leftmenuItem1) {    
     $button.find("#label").text("Add Direct IP Range"); 
     $button.show();   
     $button.unbind("click").bind("click", function(event) {