Skip to content

Commit a685c3c

Browse files
Remove deprecated global variables
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
1 parent 9205a21 commit a685c3c

15 files changed

Lines changed: 146 additions & 334 deletions

apps/files/js/file-upload.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* - TODO music upload button
1919
*/
2020

21-
/* global jQuery, humanFileSize, md5 */
21+
/* global jQuery, md5 */
2222

2323
/**
2424
* File upload object
@@ -971,8 +971,8 @@ OC.Uploader.prototype = _.extend({
971971
data.textStatus = 'notenoughspace';
972972
data.errorThrown = t('files',
973973
'Not enough free space, you are uploading {size1} but only {size2} is left', {
974-
'size1': humanFileSize(selection.totalBytes),
975-
'size2': humanFileSize($('#free_space').val())
974+
'size1': OC.Util.humanFileSize(selection.totalBytes),
975+
'size2': OC.Util.humanFileSize($('#free_space').val())
976976
});
977977
}
978978

@@ -1171,9 +1171,9 @@ OC.Uploader.prototype = _.extend({
11711171
h = t('files', 'Uploading …');
11721172
}
11731173
self._setProgressBarText(h, h, t('files', '{loadedSize} of {totalSize} ({bitrate})' , {
1174-
loadedSize: humanFileSize(data.loaded),
1175-
totalSize: humanFileSize(total),
1176-
bitrate: humanFileSize(data.bitrate / 8) + '/s'
1174+
loadedSize: OC.Util.humanFileSize(data.loaded),
1175+
totalSize: OC.Util.humanFileSize(total),
1176+
bitrate: OC.Util.humanFileSize(data.bitrate / 8) + '/s'
11771177
}));
11781178
self._setProgressBarValue(progress);
11791179
self.trigger('progressall', e, data);

apps/files/js/filelist.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1606,7 +1606,7 @@
16061606

16071607
// size column
16081608
if (typeof(fileData.size) !== 'undefined' && fileData.size >= 0) {
1609-
simpleSize = humanFileSize(parseInt(fileData.size, 10), true);
1609+
simpleSize = OC.Util.humanFileSize(parseInt(fileData.size, 10), true);
16101610
// rgb(118, 118, 118) / #767676
16111611
// min. color contrast for normal text on white background according to WCAG AA
16121612
sizeColor = Math.round(118-Math.pow((fileData.size/(1024*1024)), 2));

core/js/dist/login.js

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/login.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/main.js

Lines changed: 68 additions & 150 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/maintenance.js

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/maintenance.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/recommendedapps.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/recommendedapps.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)