summaryrefslogtreecommitdiffstats
path: root/pyload/web/app/scripts
diff options
context:
space:
mode:
authorGravatar Koch Michael <charlie8913@gmail.com> 2014-06-01 22:16:13 +0200
committerGravatar Koch Michael <charlie8913@gmail.com> 2014-06-01 22:27:52 +0200
commit29d6ab2c5f5089f7e3f6c0de67a0212eacbbd068 (patch)
tree03fbebcc6d46cca08ad7873ace5e13d4e7e87ea6 /pyload/web/app/scripts
parentRevert "Merge branch 'fix-uploadedto'" (diff)
downloadpyload-29d6ab2c5f5089f7e3f6c0de67a0212eacbbd068.tar.xz
Show correct Value for 'Traffic left' in Accounts View
afaik all the traffic values are in KiB, so the byte-value it has to be multiplied by 1024 for the accounts View to show it correctly
Diffstat (limited to 'pyload/web/app/scripts')
-rw-r--r--pyload/web/app/scripts/helpers/formatSize.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/pyload/web/app/scripts/helpers/formatSize.js b/pyload/web/app/scripts/helpers/formatSize.js
index f72d62158..ddd62a1a5 100644
--- a/pyload/web/app/scripts/helpers/formatSize.js
+++ b/pyload/web/app/scripts/helpers/formatSize.js
@@ -3,7 +3,11 @@ define('helpers/formatSize', ['handlebars', 'utils/i18n'], function(Handlebars,
'use strict';
var sizes = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB'];
- function formatSize(bytes, options) {
+ function formatSize(bytes, options, multiplier) {
+ //multiplier 1024 is used for trafficleft because trafficleft is in KiB
+ if (typeof multiplier === 'number')
+ bytes = bytes * multiplier;
+
if (!bytes || bytes === 0) return '0 B';
if (bytes === -1)
return i18n.gettext('not available');
@@ -17,4 +21,4 @@ define('helpers/formatSize', ['handlebars', 'utils/i18n'], function(Handlebars,
Handlebars.registerHelper('formatSize', formatSize);
return formatSize;
-}); \ No newline at end of file
+});