X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fwifi_status.htm;h=2484fd3c6bb9bfcb3ea9668c656919984b33eb2b;hp=76635bf70230c02447ecbe88a09f4db3fc4e0a45;hb=d2c188278629fa51f894a836947dbac5d691a6dd;hpb=630d559c2663af690bb7101ff39745e395cb5378

diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm
index 76635bf70..2484fd3c6 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm
@@ -1,73 +1,65 @@
 <%+cbi/valueheader%>
 
 <script type="text/javascript">//<![CDATA[
-	var iwxhr = new XHR();
-
-	(function() {
-		var func = arguments.callee;
-
-		iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "wireless_status", self.ifname)%>', null,
-			function(x, iw)
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "wireless_status", self.ifname)%>', null,
+		function(x, iw)
+		{
+			if (iw && (iw = iw[0]))
 			{
-				if (iw && (iw = iw[0]))
-				{
-					var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel);
-					var p = iw.quality;
-					var q = is_assoc ? p : -1;
-
-					var icon;
-					if (q < 0)
-						icon = "<%=resource%>/icons/signal-none.png";
-					else if (q == 0)
-						icon = "<%=resource%>/icons/signal-0.png";
-					else if (q < 25)
-						icon = "<%=resource%>/icons/signal-0-25.png";
-					else if (q < 50)
-						icon = "<%=resource%>/icons/signal-25-50.png";
-					else if (q < 75)
-						icon = "<%=resource%>/icons/signal-50-75.png";
-					else
-						icon = "<%=resource%>/icons/signal-75-100.png";
+				var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel);
+				var p = iw.quality;
+				var q = is_assoc ? p : -1;
 
-					var s = document.getElementById('<%=self.option%>-iw-signal');
-					if (s)
-						s.innerHTML = String.format(
-							'<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" /><br />' +
-							'<small>%d%%</small>', icon, iw.signal, iw.noise, p
-						);
+				var icon;
+				if (q < 0)
+					icon = "<%=resource%>/icons/signal-none.png";
+				else if (q == 0)
+					icon = "<%=resource%>/icons/signal-0.png";
+				else if (q < 25)
+					icon = "<%=resource%>/icons/signal-0-25.png";
+				else if (q < 50)
+					icon = "<%=resource%>/icons/signal-25-50.png";
+				else if (q < 75)
+					icon = "<%=resource%>/icons/signal-50-75.png";
+				else
+					icon = "<%=resource%>/icons/signal-75-100.png";
 
-					var d = document.getElementById('<%=self.option%>-iw-description');
-					if (d && is_assoc)
-						d.innerHTML = String.format(
-							'<strong><%:Mode%>:</strong> %s | ' +
-							'<strong><%:SSID%>:</strong> %h<br />' +
-							'<strong><%:BSSID%>:</strong> %s | ' +
-							'<strong><%:Encryption%>:</strong> %s<br />' +
-							'<strong><%:Channel%>:</strong> %d (%.3f GHz) | ' +
-							'<strong><%:Tx-Power%>:</strong> %d dBm<br />' +
-							'<strong><%:Signal%>:</strong> %d dBm | ' +
-							'<strong><%:Noise%>:</strong> %d dBm<br />' +
-							'<strong><%:Bit Rate%>:</strong> %.1f MBit/s | ' +
-							'<strong><%:Country%>:</strong> %s',
-								iw.mode, iw.ssid, iw.bssid,
-								iw.encryption ? iw.encryption : '<%:None%>',
-								iw.channel, iw.frequency ? iw.frequency : 0,
-								iw.txpower, iw.signal, iw.noise,
-								iw.bitrate ? iw.bitrate : 0, iw.country
-						);
-					else if (d)
-						d.innerHTML = String.format(
-							'<strong><%:SSID%>:</strong> %h | ' +
-							'<strong><%:Mode%>:</strong> %s<br />' +
-							'<em><%:Wireless is disabled or not associated%></em>',
-								iw.ssid || '?', iw.mode
-						);
-				}
+				var s = document.getElementById('<%=self.option%>-iw-signal');
+				if (s)
+					s.innerHTML = String.format(
+						'<img src="%s" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>" /><br />' +
+						'<small>%d%%</small>', icon, iw.signal, iw.noise, p
+					);
 
-				window.setTimeout(func, 5000);
+				var d = document.getElementById('<%=self.option%>-iw-description');
+				if (d && is_assoc)
+					d.innerHTML = String.format(
+						'<strong><%:Mode%>:</strong> %s | ' +
+						'<strong><%:SSID%>:</strong> %h<br />' +
+						'<strong><%:BSSID%>:</strong> %s | ' +
+						'<strong><%:Encryption%>:</strong> %s<br />' +
+						'<strong><%:Channel%>:</strong> %d (%.3f <%:GHz%>) | ' +
+						'<strong><%:Tx-Power%>:</strong> %d <%:dBm%><br />' +
+						'<strong><%:Signal%>:</strong> %d <%:dBm%> | ' +
+						'<strong><%:Noise%>:</strong> %d <%:dBm%><br />' +
+						'<strong><%:Bitrate%>:</strong> %.1f <%:Mbit/s%> | ' +
+						'<strong><%:Country%>:</strong> %s',
+							iw.mode, iw.ssid, iw.bssid,
+							iw.encryption ? iw.encryption : '<%:None%>',
+							iw.channel, iw.frequency ? iw.frequency : 0,
+							iw.txpower, iw.signal, iw.noise,
+							iw.bitrate ? iw.bitrate : 0, iw.country
+					);
+				else if (d)
+					d.innerHTML = String.format(
+						'<strong><%:SSID%>:</strong> %h | ' +
+						'<strong><%:Mode%>:</strong> %s<br />' +
+						'<em><%:Wireless is disabled or not associated%></em>',
+							iw.ssid || '?', iw.mode
+					);
 			}
-		)
-	})();
+		}
+	);
 //]]></script>
 
 <table>