diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-02-07 17:08:50 +0100 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-03-09 13:31:50 +0100 |
| commit | bb1d8b318964b5b778e4c381db2f9ff281164384 (patch) | |
| tree | 363ad7483868749111c6ba96b09dcf3f99ae751a /apps/files | |
| parent | ac03f54079535fd9e047fbe3fbbe2a5768eb6e83 (diff) | |
| download | nextcloud-server-bb1d8b318964b5b778e4c381db2f9ff281164384.tar.gz nextcloud-server-bb1d8b318964b5b778e4c381db2f9ff281164384.zip | |
Remove deprecated global variables
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/file-upload.js | 12 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index b987fa4e42b..5aed0f60149 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -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); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 38b8dc54923..2ca4185ec86 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1606,7 +1606,7 @@ // size column if (typeof(fileData.size) !== 'undefined' && fileData.size >= 0) { - simpleSize = humanFileSize(parseInt(fileData.size, 10), true); + simpleSize = OC.Util.humanFileSize(parseInt(fileData.size, 10), true); // rgb(118, 118, 118) / #767676 // min. color contrast for normal text on white background according to WCAG AA sizeColor = Math.round(118-Math.pow((fileData.size/(1024*1024)), 2)); |