diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-09-25 20:51:03 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-09-25 20:51:03 +0000 |
| commit | e3435a49e9ba289d6e43758fbcbc29804f7bbbc1 (patch) | |
| tree | 0599bf9d3ff4df760897d3e65bf08b9cb6e54ffb | |
| parent | ea6f5379dc147bdc83b687a8bbf011edd07d16fc (diff) | |
modules/admin-full: various javascript fixes in templates
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_network/iface_status.htm | 2 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_status/index.htm | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/admin-full/luasrc/view/admin_network/iface_status.htm b/modules/admin-full/luasrc/view/admin_network/iface_status.htm index 508ccbb92..69ae05272 100644 --- a/modules/admin-full/luasrc/view/admin_network/iface_status.htm +++ b/modules/admin-full/luasrc/view/admin_network/iface_status.htm @@ -19,7 +19,7 @@ '<img src="<%=resource%>/icons/%s%s.png" style="width:16px; height:16px" />' + '<br /><small>%s</small>', ifc.type, ifc.is_up ? '' : '_disabled', - ifc.name + ifc.is_up ? ifc.ifname : '?' ); var d = document.getElementById('<%=self.option%>-ifc-description'); diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm index 850c30ab1..f76511e0a 100644 --- a/modules/admin-full/luasrc/view/admin_status/index.htm +++ b/modules/admin-full/luasrc/view/admin_status/index.htm @@ -123,7 +123,9 @@ $Id$ var wifidevs = <%=luci.http.write_json(netdevs)%>; var arptable = <%=luci.http.write_json(arpcache)%>; - var update_status = function() { + (function() { + var func = arguments.callee; + iwxhr.get('<%=REQUEST_URI%>', { status: 1 }, function(x, info) { @@ -457,12 +459,10 @@ $Id$ if (e = document.getElementById('conns')) e.innerHTML = progressbar(info.conncount, info.connmax); - window.setTimeout(update_status, 5000); + window.setTimeout(func, 5000); } ) - }; - - update_status(); + })(); //]]></script> <h2><a id="content" name="content"><%:Status%></a></h2> |