diff --git a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js index b9273744a..9e8f265c3 100644 --- a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js +++ b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js @@ -11,15 +11,6 @@ 'require ui'; 'require view'; -function formatBytes(bytes, decimals = 2) { - if (bytes === 0) return '0 Bytes'; - const k = 1024; - const dm = decimals < 0 ? 0 : decimals; - const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; - const i = Math.floor(Math.log(bytes) / Math.log(k)); - return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]; -} - return view.extend({ load: function() { return fs.exec('/sbin/ip', ['-s', '-j', 'ad']).then(function(res) { @@ -47,8 +38,8 @@ return view.extend({ }); parsedInfo.mtu = iface.mtu; - parsedInfo.rxBytes = formatBytes(iface.stats64.rx.bytes); - parsedInfo.txBytes = formatBytes(iface.stats64.tx.bytes); + parsedInfo.rxBytes = '%1024mB'.format(iface.stats64.rx.bytes); + parsedInfo.txBytes = '%1024mB'.format(iface.stats64.tx.bytes); return parsedInfo; }); diff --git a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js index 918f092b8..135ba7251 100644 --- a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js +++ b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js @@ -195,7 +195,7 @@ return view.extend({ o = s.taboption('advance', form.ListValue, 'exitNode', _('Online Exit Nodes'), _('Select an online machine name to use as an exit node.')); if (onlineExitNodes.length > 0) { - o.optional = false; + o.optional = true; onlineExitNodes.forEach(function(node) { o.value(node, node); });