Commit f2c9cc17 by Torkel Ödegaard

#Closes #269, changed byte and bit formats to conform with IEC standard symbols,…

#Closes #269, changed byte and bit formats to conform with IEC standard symbols, like Kib, Mib for bits, and KiB, MiB, GiB for bytes
parent 1a34c2ee
...@@ -430,28 +430,28 @@ function($, _, moment) { ...@@ -430,28 +430,28 @@ function($, _, moment) {
ext = " B"; ext = " B";
break; break;
case 1: case 1:
ext = " KB"; ext = " KiB";
break; break;
case 2: case 2:
ext = " MB"; ext = " MiB";
break; break;
case 3: case 3:
ext = " GB"; ext = " GiB";
break; break;
case 4: case 4:
ext = " TB"; ext = " TiB";
break; break;
case 5: case 5:
ext = " PB"; ext = " PiB";
break; break;
case 6: case 6:
ext = " EB"; ext = " EiB";
break; break;
case 7: case 7:
ext = " ZB"; ext = " ZiB";
break; break;
case 8: case 8:
ext = " YB"; ext = " YiB";
break; break;
} }
...@@ -477,28 +477,28 @@ function($, _, moment) { ...@@ -477,28 +477,28 @@ function($, _, moment) {
ext = " b"; ext = " b";
break; break;
case 1: case 1:
ext = " Kb"; ext = " Kib";
break; break;
case 2: case 2:
ext = " Mb"; ext = " Mib";
break; break;
case 3: case 3:
ext = " Gb"; ext = " Gib";
break; break;
case 4: case 4:
ext = " Tb"; ext = " Tib";
break; break;
case 5: case 5:
ext = " Pb"; ext = " Pib";
break; break;
case 6: case 6:
ext = " Eb"; ext = " Eib";
break; break;
case 7: case 7:
ext = " Zb"; ext = " Zib";
break; break;
case 8: case 8:
ext = " Yb"; ext = " Yib";
break; break;
} }
......
...@@ -248,10 +248,7 @@ function (angular, $, kbn, moment, _) { ...@@ -248,10 +248,7 @@ function (angular, $, kbn, moment, _) {
} }
function configureAxisMode(axis, format) { function configureAxisMode(axis, format) {
if (format === 'bytes') { if (format !== 'none') {
axis.mode = 'byte';
}
else if (format !== 'none') {
axis.tickFormatter = kbn.getFormatFunction(format, 1); axis.tickFormatter = kbn.getFormatFunction(format, 1);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment