From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 26 Sep 2011 00:26:19 +0000 (+0000)
Subject: applications/luci-ahcp: rework status javascript to use XHR.poll()
X-Git-Tag: 0.11.0~1692
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=97f74fe7665c4bc317d9590bcafc2c109c861a3d;p=oweals%2Fluci.git

applications/luci-ahcp: rework status javascript to use XHR.poll()
---

diff --git a/applications/luci-ahcp/luasrc/view/ahcp_status.htm b/applications/luci-ahcp/luasrc/view/ahcp_status.htm
index f9ac7c3b0..abe8879a4 100644
--- a/applications/luci-ahcp/luasrc/view/ahcp_status.htm
+++ b/applications/luci-ahcp/luasrc/view/ahcp_status.htm
@@ -1,48 +1,41 @@
 <script type="text/javascript">//<![CDATA[
-	var stxhr = new XHR();
-	(function() {
-		var func = arguments.callee;
-
-		stxhr.get('<%=luci.dispatcher.build_url("admin", "network", "ahcpd", "status")%>', null,
-			function(x, st)
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "ahcpd", "status")%>', null,
+		function(x, st)
+		{
+			var tb = document.getElementById('ahcpd_status_table');
+			var tx = document.getElementById('ahcpd_status_text');
+			if (st && tb && tx)
 			{
-				var tb = document.getElementById('ahcpd_status_table');
-				var tx = document.getElementById('ahcpd_status_text');
-				if (st && tb && tx)
-				{
-					/* clear all rows */
-					while( tb.rows.length > 1 )
-						tb.deleteRow(1);
-
-					for( var i = 0; i < st.leases.length; i++ )
-					{
-						var tr = tb.insertRow(-1);
-							tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+				/* clear all rows */
+				while( tb.rows.length > 1 )
+					tb.deleteRow(1);
 
-						tr.insertCell(-1).innerHTML = st.leases[i].addr;
-						tr.insertCell(-1).innerHTML = String.format('%t', st.leases[i].age);
-					}
+				for( var i = 0; i < st.leases.length; i++ )
+				{
+					var tr = tb.insertRow(-1);
+						tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
 
-					if( tb.rows.length == 1 )
-					{
-						var tr = tb.insertRow(-1);
-							tr.className = 'cbi-section-table-row';
+					tr.insertCell(-1).innerHTML = st.leases[i].addr;
+					tr.insertCell(-1).innerHTML = String.format('%t', st.leases[i].age);
+				}
 
-						var td = tr.insertCell(-1);
-							td.colSpan = 2;
-							td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
-					}
+				if( tb.rows.length == 1 )
+				{
+					var tr = tb.insertRow(-1);
+						tr.className = 'cbi-section-table-row';
 
-					if( st.uid == '00:00:00:00:00:00:00:00' )
-						tx.innerHTML = 'The AHCP Service is not running.';
-					else
-						tx.innerHTML = String.format('The AHCP Service is running with ID %s.', st.uid);
+					var td = tr.insertCell(-1);
+						td.colSpan = 2;
+						td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
 				}
 
-				window.setTimeout(func, 5000);
+				if( st.uid == '00:00:00:00:00:00:00:00' )
+					tx.innerHTML = 'The AHCP Service is not running.';
+				else
+					tx.innerHTML = String.format('The AHCP Service is running with ID %s.', st.uid);
 			}
-		)
-	})();
+		}
+	);
 //]]></script>
 
 <fieldset class="cbi-section">