diff --git a/src/filemanager.html b/src/filemanager.html index cc7510a4d..85064f4d5 100644 --- a/src/filemanager.html +++ b/src/filemanager.html @@ -215,6 +215,7 @@

{{ 'filemanager.uploadingDialog.errorAlreadyExists' | tr }}

{{ 'filemanager.uploadingDialog.errorFailed' | tr }}

+ {{ uploadStatus.sizeDone | prettyByteSize }} (total {{ uploadStatus.size | prettyByteSize }})
diff --git a/src/js/filemanager.js b/src/js/filemanager.js index 34a17b8af..0915d81c8 100644 --- a/src/js/filemanager.js +++ b/src/js/filemanager.js @@ -353,6 +353,7 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl $scope.uploadStatus.count = files.length; $scope.uploadStatus.countDone = 0; $scope.uploadStatus.size = 0; + $scope.uploadStatus.sizeDone = 0; $scope.uploadStatus.done = 0; $scope.uploadStatus.percentDone = 0; @@ -367,6 +368,7 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl Client.filesUpload($scope.id, $scope.type, filePath, file, overwrite, function (loaded) { $scope.uploadStatus.percentDone = ($scope.uploadStatus.done+loaded) * 100 / $scope.uploadStatus.size; + $scope.uploadStatus.sizeDone += loaded; }, function (error) { if (error) return callback(error); @@ -393,6 +395,7 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl $scope.uploadStatus.fileName = ''; $scope.uploadStatus.count = 0; $scope.uploadStatus.size = 0; + $scope.uploadStatus.sizeDone = 0; $scope.uploadStatus.done = 0; $scope.uploadStatus.percentDone = 100; $scope.uploadStatus.files = [];