diff options
author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-10-16 18:04:40 -0200 |
---|---|---|
committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-10-16 18:05:23 -0200 |
commit | ebfc87d6b86ce83d93fe89d3f467846059fdd708 (patch) | |
tree | c9bbc2ad57e98ef1572c268f5c9da69deadf17d7 | |
parent | e3c1ea9b9a415f30c7e7d6788c719119e50aa37d (diff) | |
download | pfsense-ebfc87d6b86ce83d93fe89d3f467846059fdd708.zip pfsense-ebfc87d6b86ce83d93fe89d3f467846059fdd708.tar.gz |
Converting from prototype to jQuery
-rwxr-xr-x | usr/local/www/diag_arp.php | 2 | ||||
-rw-r--r-- | usr/local/www/diag_limiter_info.php | 10 | ||||
-rwxr-xr-x | usr/local/www/diag_nanobsd.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_ndp.php | 2 | ||||
-rw-r--r-- | usr/local/www/diag_pf_info.php | 10 | ||||
-rw-r--r-- | usr/local/www/diag_system_activity.php | 10 | ||||
-rw-r--r-- | usr/local/www/diag_system_pftop.php | 12 | ||||
-rw-r--r-- | usr/local/www/diag_tables.php | 11 |
8 files changed, 31 insertions, 28 deletions
diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php index 9dc12a5..f79efce 100755 --- a/usr/local/www/diag_arp.php +++ b/usr/local/www/diag_arp.php @@ -342,5 +342,5 @@ $mac_man = load_mac_manufacturer_table(); <?php include("fend.inc"); ?> <script type="text/javascript"> - $('loading').innerHTML = ''; + jQuery('#loading').html(''); </script> diff --git a/usr/local/www/diag_limiter_info.php b/usr/local/www/diag_limiter_info.php index c2f68aa..b56a641 100644 --- a/usr/local/www/diag_limiter_info.php +++ b/usr/local/www/diag_limiter_info.php @@ -68,16 +68,16 @@ include("head.inc"); function getlimiteractivity() { var url = "/diag_limiter_info.php"; var pars = 'getactivity=yes'; - var myAjax = new Ajax.Request( + jQuery.ajax( url, { - method: 'post', - parameters: pars, - onComplete: activitycallback + type: 'post', + data: pars, + complete: activitycallback }); } function activitycallback(transport) { - $('limiteractivitydiv').innerHTML = '<font face="Courier"><font size="2"><b><pre style="text-align:left;">' + transport.responseText + '</pre></font>'; + jQuery('#limiteractivitydiv').html('<font face="Courier"><font size="2"><b><pre style="text-align:left;">' + transport.responseText + '</pre></font>'); setTimeout('getlimiteractivity()', 2000); } setTimeout('getlimiteractivity()', 5000); diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php index 51348cf..5bda13a 100755 --- a/usr/local/www/diag_nanobsd.php +++ b/usr/local/www/diag_nanobsd.php @@ -263,7 +263,7 @@ if ($savemsg) // Clear the loading indicator echo "<script type=\"text/javascript\">"; -echo "$('loading').innerHTML = '';"; +echo "jQuery('#loading').html('');"; echo "</script>"; ?> diff --git a/usr/local/www/diag_ndp.php b/usr/local/www/diag_ndp.php index c99da4e..6a02760 100755 --- a/usr/local/www/diag_ndp.php +++ b/usr/local/www/diag_ndp.php @@ -159,5 +159,5 @@ ob_implicit_flush(1); <?php include("fend.inc"); ?> <script type="text/javascript"> - $('loading').innerHTML = ''; + jQuery('#loading').html(''); </script> diff --git a/usr/local/www/diag_pf_info.php b/usr/local/www/diag_pf_info.php index cba9727..cbb19ae 100644 --- a/usr/local/www/diag_pf_info.php +++ b/usr/local/www/diag_pf_info.php @@ -66,16 +66,16 @@ include("head.inc"); function getcpuactivity() { var url = "/diag_pf_info.php"; var pars = 'getactivity=yes'; - var myAjax = new Ajax.Request( + jQuery.ajax( url, { - method: 'post', - parameters: pars, - onComplete: activitycallback + type: 'post', + data: pars, + complete: activitycallback }); } function activitycallback(transport) { - $('cpuactivitydiv').innerHTML = '<font face="Courier"><font size="2"><b><pre style="text-align:left;">' + transport.responseText + '</pre></font>'; + jQuery('#cpuactivitydiv').html('<font face="Courier"><font size="2"><b><pre style="text-align:left;">' + transport.responseText + '</pre></font>'); setTimeout('getcpuactivity()', 2000); } setTimeout('getcpuactivity()', 5000); diff --git a/usr/local/www/diag_system_activity.php b/usr/local/www/diag_system_activity.php index e1e8003..272a7da 100644 --- a/usr/local/www/diag_system_activity.php +++ b/usr/local/www/diag_system_activity.php @@ -61,16 +61,16 @@ include("head.inc"); scroll(0,0); var url = "/diag_system_activity.php"; var pars = 'getactivity=yes'; - var myAjax = new Ajax.Request( + jQuery.ajax( url, { - method: 'post', - parameters: pars, - onComplete: activitycallback + type: 'post', + data: pars, + complete: activitycallback }); } function activitycallback(transport) { - $('cpuactivitydiv').innerHTML = '<font face="Courier"><font size="2"><b><pre style="text-align:left;">' + transport.responseText + '</pre></font>'; + jQuery('#cpuactivitydiv').html('<font face="Courier"><font size="2"><b><pre style="text-align:left;">' + transport.responseText + '</pre></font>'); setTimeout('getcpuactivity()', 2500); } setTimeout('getcpuactivity()', 1000); diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php index 673d226..ee233a8 100644 --- a/usr/local/www/diag_system_pftop.php +++ b/usr/local/www/diag_system_pftop.php @@ -67,17 +67,17 @@ else <script type="text/javascript"> function getcpuactivity() { var url = "/diag_system_pftop.php"; - var pars = 'getactivity=yes&sorttype=' + $('sorttype').value; - var myAjax = new Ajax.Request( + var pars = 'getactivity=yes&sorttype=' + jQuery('#sorttype').val(); + jQuery.ajax( url, { - method: 'post', - parameters: pars, - onComplete: activitycallback + type: 'post', + data: pars, + complete: activitycallback }); } function activitycallback(transport) { - $('cpuactivitydiv').innerHTML = '<font face="Courier"><font size="2"><b><pre style="text-align:left;">' + transport.responseText + '</pre></font>'; + jQuery('#cpuactivitydiv').html('<font face="Courier"><font size="2"><b><pre style="text-align:left;">' + transport.responseText + '</pre></font>'); setTimeout('getcpuactivity()', 2500); } setTimeout('getcpuactivity()', 1000); diff --git a/usr/local/www/diag_tables.php b/usr/local/www/diag_tables.php index eba3d5f..d6a468a 100644 --- a/usr/local/www/diag_tables.php +++ b/usr/local/www/diag_tables.php @@ -103,10 +103,13 @@ include("fbegin.inc"); window.location='diag_tables.php?type=' + entrytype; } function del_entry(entry) { - new Ajax.Request("diag_tables.php?type=<?php echo $tablename;?>&delete=" + entry, { - onComplete: function(response) { - if (200 == response.status) - new Effect.Fade($(response.responseText), { duration: 1.0 } ); + jQuery.ajax("diag_tables.php?type=<?php echo $tablename;?>&delete=" + entry, { + complete: function(response) { + if (200 == response.status) { + // Escape all dots to not confuse jQuery selectors + name = response.responseText.replace(/\./g,'\\.'); + jQuery('#' + name).fadeOut(1000); + } } }); } |