From 6fa7d4f6124fa945eece2dc3326945e1145f543b Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 12 Apr 2012 15:39:41 -0700 Subject: [PATCH] cloudstack 3.0 UI - fix a JS error "selectedNetworkOfferingObj is not defined" --- ui/scripts/zoneWizard.js | 59 +++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 2355e411e16..2e4227b1298 100644 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -292,36 +292,8 @@ else { //args.data['network-model'] == 'Advanced' args.$form.find('[rel=networkOfferingId]').hide(); args.$form.find('[rel=guestcidraddress]').show(); - } - - args.$form.find('[rel=networkOfferingId]').change(function(){ - //reset when different network offering is selected - selectedNetworkOfferingHavingSG = false; - selectedNetworkOfferingHavingEIP = false; - selectedNetworkOfferingHavingELB = false; - selectedNetworkOfferingHavingNetscaler = false; - - var selectedNetworkOfferingId = $(this).val(); - - $(networkOfferingObjs).each(function(){ - if(this.id == selectedNetworkOfferingId) { - selectedNetworkOfferingObj = this; - return false; //break $.each() loop - } - }); - - if(selectedNetworkOfferingObj.havingNetscaler == true) - selectedNetworkOfferingHavingNetscaler = true; - if(selectedNetworkOfferingObj.havingSG == true) - selectedNetworkOfferingHavingSG = true; - if(selectedNetworkOfferingObj.havingEIP == true) - selectedNetworkOfferingHavingEIP = true; - if(selectedNetworkOfferingObj.havingELB == true) - selectedNetworkOfferingHavingELB = true; - - }); - //??? - + } + setTimeout(function() { if ($form.find('input[name=ispublic]').is(':checked')) { $form.find('[rel=domain]').hide(); @@ -433,7 +405,32 @@ description: offering.name }; }) - }); + }); + + args.$select.unbind("change").bind("change", function(){ + //reset when different network offering is selected + selectedNetworkOfferingHavingSG = false; + selectedNetworkOfferingHavingEIP = false; + selectedNetworkOfferingHavingELB = false; + selectedNetworkOfferingHavingNetscaler = false; + + var selectedNetworkOfferingId = $(this).val(); + $(networkOfferingObjs).each(function(){ + if(this.id == selectedNetworkOfferingId) { + selectedNetworkOfferingObj = this; + return false; //break $.each() loop + } + }); + + if(selectedNetworkOfferingObj.havingNetscaler == true) + selectedNetworkOfferingHavingNetscaler = true; + if(selectedNetworkOfferingObj.havingSG == true) + selectedNetworkOfferingHavingSG = true; + if(selectedNetworkOfferingObj.havingEIP == true) + selectedNetworkOfferingHavingEIP = true; + if(selectedNetworkOfferingObj.havingELB == true) + selectedNetworkOfferingHavingELB = true; + }); } }); }