web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add pretty-printers for byte-counts

Browse Source
This commit is contained in:
ansuz
2017-04-18 15:44:15 +02:00
parent 2a25afae5f
commit 2b8579e8b7
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/common-util.js
View File

@@ -81,5 +81,13 @@ define([], function () {
.replace(/_+/g, '_');
};
var bytesToMegabytes = Util.bytesToMegabytes = function (bytes) {
return Math.floor((bytes / (1024 * 1024) * 100)) / 100;
};
var bytesToKilobytes = Util.bytesToKilobytes = function (bytes) {
return Math.floor(bytes / 1024 * 100) / 100;
};
return Util;
});

2
www/common/cryptpad-common.js
View File

@@ -63,6 +63,8 @@ define([
var replaceHash = common.replaceHash = Util.replaceHash;
var getHash = common.getHash = Util.getHash;
var fixFileName = common.fixFileName = Util.fixFileName;
common.bytesToMegabytes = Util.bytesToMegabytes;
common.bytesToKilobytes = Util.bytesToKilobytes;
// import hash utilities for export
var createRandomHash = common.createRandomHash = Hash.createRandomHash;

6
www/settings/main.js
View File

@@ -226,10 +226,6 @@ define([
return $div;
};
var bytesToMegabytes = function (bytes) {
return Math.floor((bytes / (1024 * 1024) * 100)) / 100;
};
var createUsageButton = function (obj) {
var proxy = obj.proxy;
@@ -252,7 +248,7 @@ define([
Cryptpad.alert(Messages.settings_pinningError);
return;
}
Cryptpad.alert(Messages._getKey('settings_usageAmount', [bytesToMegabytes(bytes)]));
Cryptpad.alert(Messages._getKey('settings_usageAmount', [Cryptpad.bytesToMegabytes(bytes)]));
});
})
.appendTo($div);