etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Network page - initialize JQuery dialog only when new JSP file is being loaded into right panel.

This commit is contained in:
Jessica Wang 2010-12-17 11:47:49 -08:00
parent aa4bc2b4a0
commit 68f8f1ccf7
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui/scripts/cloud.core.network.js
View File

@ -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));

5
ui/scripts/cloud.core.pod.js
View File

@ -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) {