Freifunk-Leipzig
/
gluon-firmware
Archived
13
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

gluon-status-page: unify prefix list of prettyBytes and prettyBits

This commit is contained in:
Matthias Schiffer 2016-02-24 22:32:22 +01:00
parent 6e452f207a
commit 289b599233
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/gluon-status-page/src/js/lib/gui/statistics.js
View File

@ -178,7 +178,7 @@ define(["lib/helper"], function (Helper) {
function prettyPrefix(prefixes, step, d) {
var prefix = 0
while (d > step && prefix < 4) {
while (d > step && prefix < prefixes.length - 1) {
d /= step
prefix++
}
@ -187,12 +187,16 @@ define(["lib/helper"], function (Helper) {
return d + " " + prefixes[prefix]
}
function prettySize(d) {
return prettyPrefix([ "", "k", "M", "G", "T" ], 1024, d)
}
function prettyBits(d) {
return prettyPrefix([ "bps", "kbps", "Mbps", "Gbps" ], 1024, d * 8)
return prettySize(d * 8) + "bps"
}
function prettyBytes(d) {
return prettyPrefix([ "B", "kB", "MB", "GB", "TB" ], 1024, d)
return prettySize(d) + "B"
}
function prettyUptime(seconds) {