Changeset 7570

Timestamp:

09/26/11 01:26:19 (20 months ago)

Author:

jow

Message:

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

Files:

• luci/trunk/applications/luci-ahcp/luasrc/view/ahcp_status.htm (modified) (1 diff)

luci/trunk/applications/luci-ahcp/luasrc/view/ahcp_status.htm

@@ -1 +1 @@
 <script type="text/javascript">//<![CDATA[
-    var stxhr = new XHR();
-    (function() {
-        var func = arguments.callee;
+    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)
+            {
+                /* clear all rows */
+                while( tb.rows.length > 1 )
+                    tb.deleteRow(1);
 
-        stxhr.get('<%=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)
+                for( var i = 0; i < st.leases.length; i++ )
                 {
-                    /* clear all rows */
-                    while( tb.rows.length > 1 )
-                        tb.deleteRow(1);
+                    var tr = tb.insertRow(-1);
+                        tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 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);
-
-                        tr.insertCell(-1).innerHTML = st.leases[i].addr;
-                        tr.insertCell(-1).innerHTML = String.format('%t', st.leases[i].age);
-                    }
-
-                    if( tb.rows.length == 1 )
-                    {
-                        var tr = tb.insertRow(-1);
-                            tr.className = 'cbi-section-table-row';
-
-                        var td = tr.insertCell(-1);
-                            td.colSpan = 2;
-                            td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
-                    }
-
-                    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);
+                    tr.insertCell(-1).innerHTML = st.leases[i].addr;
+                    tr.insertCell(-1).innerHTML = String.format('%t', st.leases[i].age);
                 }
 
-                window.setTimeout(func, 5000);
+                if( tb.rows.length == 1 )
+                {
+                    var tr = tb.insertRow(-1);
+                        tr.className = 'cbi-section-table-row';
+
+                    var td = tr.insertCell(-1);
+                        td.colSpan = 2;
+                        td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
+                }
+
+                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>