Converting from scriptaculous to jQuery

2 files changed, 122 insertions, 128 deletions

diff --git a/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js b/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js
index 3072a05..ce4461d 100644
--- a/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js
+++ b/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js
@@ -16,83 +16,83 @@ function update_select_list(new_options, select_list){
 
 function show_advanced(hide){
 	var select_list = document.iform["interfaces[]"].options;
-	var adv_rows = parseInt($('adv_rows').innerHTML);
-	var adv_show = Boolean(parseInt($('adv_show').innerHTML));
+	var adv_rows = parseInt(jQuery('#adv_rows').html());
+	var adv_show = Boolean(parseInt(jQuery('#adv_show').html()));
 	var status = Boolean(parseInt(hide));
 	if (status){
-		$('advanced_').hide();
+		jQuery('#advanced_').hide();
 		for(var j=0; j < adv_rows; j++){
-			var advanced = "advanced_" + j.toString();
-			$(advanced).show();
+			var advanced = "#advanced_" + j.toString();
+			jQuery(advanced).show();
 		}
-		$('adv_show').innerHTML = "1";
+		jQuery('#adv_show').html = "1";
 		show_hide_linkfields(select_list);
 	} else {
-		$('advanced_').show();
+		jQuery('#advanced_').show();
 		for(var j=0; j < adv_rows; j++){
-			var advanced = "advanced_" + j.toString();
-			$(advanced).hide();
+			var advanced = "#advanced_" + j.toString();
+			jQuery(advanced).hide();
 		}
-		$('adv_show').innerHTML = "0";
+		jQuery('#adv_show').html("0");
 		show_hide_linkfields(select_list);
 	}
 }
 
 function show_hide_linkfields(options){
 	var i = 0;
-	var port_count = parseInt($('port_count').innerHTML);
-	var adv_show = Boolean(parseInt($('adv_show').innerHTML));
+	var port_count = parseInt(jQuery('#port_count').html());
+	var adv_show = Boolean(parseInt(jQuery('#adv_show').html()));
 	for(var j=0; j < port_count; j++){
 		var count = j.toString();
-		var type = $('type').value;
-		var link = "link" + count;
-		var lnklabel = "linklabel" + count;
-		var bw = "bandwidth" + count;
-		var bwlabel = "bwlabel" + count;
-		var mtu = "mtu" + count;
-		var mru = "mru" + count;
-		var mrru = "mrru" + count;
-		var ipfields = "ip_fields" + count;
-		var gwfields = "gw_fields" + count;
-		var localip = "localip" + count;
-		var localiplabel = "localiplabel" + count;
-		var subnet = "subnet" + count;
-		var gateway = "gateway" + count;
-		var gatewaylabel = "gatewaylabel" + count;
+		var type = jQuery('#type').val();
+		var link = "#link" + count;
+		var lnklabel = "#linklabel" + count;
+		var bw = "#bandwidth" + count;
+		var bwlabel = "#bwlabel" + count;
+		var mtu = "#mtu" + count;
+		var mru = "#mru" + count;
+		var mrru = "#mrru" + count;
+		var ipfields = "#ip_fields" + count;
+		var gwfields = "#gw_fields" + count;
+		var localip = "#localip" + count;
+		var localiplabel = "#localiplabel" + count;
+		var subnet = "#subnet" + count;
+		var gateway = "#gateway" + count;
+		var gatewaylabel = "#gatewaylabel" + count;
 		
-		$(ipfields, gwfields ,link).invoke('hide');
-		$(subnet).disabled = true;
+		jQuery(ipfields + ',' + gwfields + ',' + link).hide();
+		jQuery(subnet).prop('disabled',true);
 		
-		$(bw).name = "bandwidth[]";
-		$(mtu).name = "mtu[]";
-		$(mru).name = "mru[]";
-		$(mrru).name = "mrru[]";
-		$(localip).name = "localip[]";
-		$(subnet).name = "subnet[]";
-		$(gateway).name = "gateway[]";
+		jQuery(bw).attr("name","bandwidth[]");
+		jQuery(mtu).attr("name","mtu[]");
+		jQuery(mru).attr("name","mru[]");
+		jQuery(mrru).attr("name","mrru[]");
+		jQuery(localip).attr("name","localip[]");
+		jQuery(subnet).attr("name","subnet[]");
+		jQuery(gateway).attr("name","gateway[]");
 		
 		while(i < options.length){
 			if (options[i].selected ){
-				$(lnklabel).innerHTML = "Link Parameters (" + options[i].value + ")";
-				$(bwlabel).innerHTML = "Bandwidth (" + options[i].value + ")";
-				$(bw).name = "bandwidth[" + options[i].value + "]";
-				$(mtu).name = "mtu[" + options[i].value + "]";
-				$(mru).name = "mru[" + options[i].value + "]";
-				$(mrru).name = "mrru[" + options[i].value + "]";
-				$(localiplabel).innerHTML = "Local IP (" + options[i].value + ")";
-				$(gatewaylabel).innerHTML = "Gateway (" + options[i].value + ")";
-				$(localip).name = "localip[" + options[i].value + "]";
-				$(subnet).name = "subnet[" + options[i].value + "]";
-				$(gateway).name = "gateway[" + options[i].value + "]";
+				jQuery(lnklabel).html("Link Parameters (" + options[i].value + ")");
+				jQuery(bwlabel).html("Bandwidth (" + options[i].value + ")");
+				jQuery(bw).attr("name","bandwidth[" + options[i].value + "]");
+				jQuery(mtu).attr("name","mtu[" + options[i].value + "]");
+				jQuery(mru).attr("name","mru[" + options[i].value + "]");
+				jQuery(mrru).attr("name","mrru[" + options[i].value + "]");
+				jQuery(localiplabel).html("Local IP (" + options[i].value + ")");
+				jQuery(gatewaylabel).html("Gateway (" + options[i].value + ")");
+				jQuery(localip).attr("name","localip[" + options[i].value + "]");
+				jQuery(subnet).attr("name","subnet[" + options[i].value + "]");
+				jQuery(gateway).attr("name","gateway[" + options[i].value + "]");
 				if (type == 'ppp' && adv_show){
-					$(ipfields, gwfields).invoke('show');
+					jQuery(ipfields + ',' + gwfields).show();
 				}
 				if (type == 'pptp' || type == 'l2tp'){
-					$(subnet).disabled = false;
-					$(ipfields, gwfields).invoke('show');
+					jQuery(subnet).prop("disabled",false);
+					jQuery(ipfields + ',' + gwfields).show();
 				}
 				if (adv_show){
-					$(link).show();
+					jQuery(link).show();
 				}
 				i++;
 				break;
@@ -104,34 +104,35 @@ function show_hide_linkfields(options){
 
 
 function updateType(t){
-	var serialports = $('serialports').innerHTML;
-	var ports = $('ports').innerHTML;
+	var serialports = jQuery('#serialports').html();
+	var ports = jQuery('#ports').html();
 	var select_list = document.iform["interfaces[]"].options;
-	$('adv_show').innerHTML = "0";
+	jQuery('#adv_show').html("0");
 	show_advanced('0');
+	jQuery("#select").show();
 	switch(t) {
 		case "select": {
-			$('ppp','pppoe','ppp_provider','phone_num','apn_').invoke('hide');
+			jQuery('#ppp,#pppoe,#ppp_provider,#phone_num,#apn_').hide();
 			select_list.length = 0;
 			select_list[0] = new Option("Select Link Type First","");
 			break;
 		}
 		case "ppp": {
 			update_select_list(serialports, select_list);
-			$('select','pppoe').invoke('hide');
-			$('ppp_provider','phone_num','apn_').invoke('show');
+			jQuery('#select,#pppoe').hide();
+			jQuery('#ppp_provider,#phone_num,#apn_').show();
 			country_list();
 			break;
 		}
 		case "pppoe": {
 			update_select_list(ports, select_list);
-			$('select','ppp','ppp_provider','phone_num','apn_').invoke('hide');
+			jQuery('#select,#ppp,#ppp_provider,#phone_num,#apn_').hide();
 			break;
 		}
 		case "l2tp":
 		case "pptp": {
 			update_select_list(ports, select_list);
-			$('select','ppp','pppoe','ppp_provider','phone_num','apn_').invoke('hide');
+			jQuery('#select,#ppp,#pppoe,#ppp_provider,#phone_num,#apn_').hide();
 			break;
 		}
 		default:
@@ -140,104 +141,97 @@ function updateType(t){
 			break;
 	}
 	if (t == "pppoe" || t == "ppp"){
-		$(t).show();
+		jQuery("#" + t).show();
 	}
 }
 
 function show_reset_settings(reset_type) {
 	if (reset_type == 'preset') { 
-		Effect.Appear('pppoepresetwrap', { duration: 0.0 });
-		Effect.Fade('pppoecustomwrap', { duration: 0.0 }); 
+		jQuery('#pppoepresetwrap').show(0);
+		jQuery('#pppoecustomwrap').hide(0);
 	} 
 	else if (reset_type == 'custom') { 
-		Effect.Appear('pppoecustomwrap', { duration: 0.0 });
-		Effect.Fade('pppoepresetwrap', { duration: 0.0 });
+		jQuery('#pppoecustomwrap').show(0);
+		jQuery('#pppoepresetwrap').hide(0);
 	} else {
-		Effect.Fade('pppoecustomwrap', { duration: 0.0 });
-		Effect.Fade('pppoepresetwrap', { duration: 0.0 });
+		jQuery('#pppoecustomwrap').hide(0);
+		jQuery('#pppoepresetwrap').hide(0);
 	}
 }
 
 function country_list() {
-	$('country').childElements().each(function(node) { node.remove(); });
-	$('provider').childElements().each(function(node) { node.remove(); });
-	$('providerplan').childElements().each(function(node) { node.remove(); });
-	new Ajax.Request("getserviceproviders.php",{
-		onSuccess: function(response) {
-			var responseTextArr = response.responseText.split("\n");
+	jQuery('#country option').remove();
+	jQuery('#provider option').remove();
+	jQuery('#providerplan option').remove();
+	jQuery.ajax("getserviceproviders.php",{
+		success: function(responseText) {
+			var responseTextArr = responseText.split("\n");
 			responseTextArr.sort();
-			responseTextArr.each( function(value) {
-				var option = new Element('option');
-				country = value.split(":");
-				option.text = country[0];
-				option.value = country[1];
-				$('country').insert({ bottom : option });
-			});
+			for(i in responseTextArr) {
+				country = responseTextArr[i].split(":");
+				jQuery('#country').append(new Option(country[0],country[1]));
+			}
 		}
 	});
-	$('trcountry').setStyle({display : "table-row"});
+	jQuery('#trcountry').css("display","table-row");
 }
 
 function providers_list() {
-	$('provider').childElements().each(function(node) { node.remove(); });
-	$('providerplan').childElements().each(function(node) { node.remove(); });
-	new Ajax.Request("getserviceproviders.php",{
-		parameters: {country : $F('country')},
-		onSuccess: function(response) {
-			var responseTextArr = response.responseText.split("\n");
+	jQuery('#provider option').remove();
+	jQuery('#providerplan option').remove();
+	jQuery.ajax("getserviceproviders.php",{
+		type: 'POST',
+		data: {country : jQuery('#country').val()},
+		success: function(responseText) {
+			var responseTextArr = responseText.split("\n");
 			responseTextArr.sort();
-			responseTextArr.each( function(value) {
-				var option = new Element('option');
-				option.text = value;
-				option.value = value;
-				$('provider').insert({ bottom : option });
-			});
+			for(i in responseTextArr) {
+				jQuery('#provider').append(new Option(responseTextArr[i],responseTextArr[i]));
+			}
 		}
 	});
-	$('trprovider').setStyle({display : "table-row"});
-	$('trproviderplan').setStyle({display : "none"});
+	jQuery('#trprovider').css("display","table-row");
+	jQuery('#trproviderplan').css("display","none");
 }
 
 function providerplan_list() {
-	$('providerplan').childElements().each(function(node) { node.remove(); });
-	$('providerplan').insert( new Element('option') );
-	new Ajax.Request("getserviceproviders.php",{
-		parameters: {country : $F('country'), provider : $F('provider')},
-		onSuccess: function(response) {
-			var responseTextArr = response.responseText.split("\n");
+	jQuery('#providerplan option').remove();
+	jQuery('#providerplan').append( new Option('','') );
+	jQuery.ajax("getserviceproviders.php",{
+		type: 'POST',
+		data: {country : jQuery('#country').val(), provider : jQuery('#provider').val()},
+		success: function(responseText) {
+			var responseTextArr = responseText.split("\n");
 			responseTextArr.sort();
-			responseTextArr.each( function(value) {
-				if(value != "") {
-					providerplan = value.split(":");
-
-					var option = new Element('option');
-					option.text = providerplan[0] + " - " + providerplan[1];
-					option.value = providerplan[1];
-					$('providerplan').insert({ bottom : option });
+			for(i in responseTextArr) {
+				if(responseTextArr[i] != "") {
+					providerplan = responseTextArr[i].split(":");
+					jQuery('#providerplan').append(new Option(providerplan[0] + " - " + providerplan[1],providerplan[1]));
 				}
-			});
+			}
 		}
 	});
-	$('trproviderplan').setStyle({display : "table-row"});
+	jQuery('#trproviderplan').css("display","table-row");
 }
 
 function prefill_provider() {
-	new Ajax.Request("getserviceproviders.php",{
-		parameters: {country : $F('country'), provider : $F('provider'), plan : $F('providerplan')},
-		onSuccess: function(response) {
-			var xmldoc = response.responseXML;
+	jQuery.ajax("getserviceproviders.php",{
+		type: "POST",
+		data: {country : jQuery('#country').val(), provider : jQuery('#provider').val(), plan : jQuery('#providerplan').val()},
+		success: function(responseXML) {
+			var xmldoc = responseXML;
 			var provider = xmldoc.getElementsByTagName('connection')[0];
-			$('username').setValue('');
-			$('password').setValue('');
+			jQuery('#username').val('');
+			jQuery('#password').val('');
 			if(provider.getElementsByTagName('apn')[0].firstChild.data == "CDMA") {
-				$('phone').setValue('#777');
-				$('apn').setValue('');
+				jQuery('#phone').val('#777');
+				jQuery('#apn').val('');
 			} else {
-				$('phone').setValue('*99#');
-				$('apn').setValue(provider.getElementsByTagName('apn')[0].firstChild.data);
+				jQuery('#phone').val('*99#');
+				jQuery('#apn').val(provider.getElementsByTagName('apn')[0].firstChild.data);
 			}
-			$('username').setValue(provider.getElementsByTagName('username')[0].firstChild.data);
-			$('password').setValue(provider.getElementsByTagName('password')[0].firstChild.data);
+			jQuery('#username').val(provider.getElementsByTagName('username')[0].firstChild.data);
+			jQuery('#password').val(provider.getElementsByTagName('password')[0].firstChild.data);
 		}
 	});
 }
diff --git a/usr/local/www/javascript/load_balancer_pool_edit/pool.js b/usr/local/www/javascript/load_balancer_pool_edit/pool.js
index fd626e5..1ecb61b 100755
--- a/usr/local/www/javascript/load_balancer_pool_edit/pool.js
+++ b/usr/local/www/javascript/load_balancer_pool_edit/pool.js
@@ -113,19 +113,19 @@ function moveOptions(theSelFrom, theSelTo)
 function checkPoolControls() {
 	var active = document.iform.serversSelect;
 	var inactive = document.iform.serversDisabledSelect;
-	if ($("mode").value == "failover") {
-		if ($("serversSelect").length > 0) {
-			$("moveToEnabled").disabled=1;
+	if (jQuery("#mode").val() == "failover") {
+		if (jQuery("#serversSelect option").length > 0) {
+			jQuery("#moveToEnabled").prop("disabled",true);
 		} else {
-			$("moveToEnabled").disabled=0;
+			jQuery("#moveToEnabled").prop("disabled",false);
 		}
 	} else {
-		$("moveToEnabled").disabled=0;
+		jQuery("#moveToEnabled").prop("disabled",false);;
 	}
 }
 
 function enforceFailover() {
-	if ($("mode").value != "failover") {
+	if (jQuery("#mode").val() != "failover") {
 		return;
 	}
 	var active = document.iform.serversSelect;