upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Call "OC.Util.humanFileSize" instead of global "humanFileSize"

Browse source 
This prevents flooding the console on big file uploads with messages
about "humanFileSize" being deprecated, which decreases the performance
(even if the developer tools of the browser are not open) and in some
cases even cause the upload to fail.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2020-04-01 14:49:07 +02:00
parent 0d872d81f4
commit 3ac3315088
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/files/js/file-upload.js
View file

@ -18,7 +18,7 @@
* - TODO music upload button
*/
/* global jQuery, humanFileSize, md5 */
/* global jQuery, md5 */
/**
* File upload object
@ -971,8 +971,8 @@ OC.Uploader.prototype = _.extend({
data.textStatus = 'notenoughspace';
data.errorThrown = t('files',
'Not enough free space, you are uploading {size1} but only {size2} is left', {
'size1': humanFileSize(selection.totalBytes),
'size2': humanFileSize($('#free_space').val())
'size1': OC.Util.humanFileSize(selection.totalBytes),
'size2': OC.Util.humanFileSize($('#free_space').val())
});
}
@ -1171,9 +1171,9 @@ OC.Uploader.prototype = _.extend({
h = t('files', 'Uploading …');
}
self._setProgressBarText(h, h, t('files', '{loadedSize} of {totalSize} ({bitrate})' , {
loadedSize: humanFileSize(data.loaded),
totalSize: humanFileSize(total),
bitrate: humanFileSize(data.bitrate / 8) + '/s'
loadedSize: OC.Util.humanFileSize(data.loaded),
totalSize: OC.Util.humanFileSize(total),
bitrate: OC.Util.humanFileSize(data.bitrate / 8) + '/s'
}));
self._setProgressBarValue(progress);
self.trigger('progressall', e, data);