diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js index 93bde3122b..78e78266d3 100644 --- a/domain-server/resources/web/content/js/content.js +++ b/domain-server/resources/web/content/js/content.js @@ -10,10 +10,20 @@ $(document).ready(function(){ function progressBarHTML(extraClass, label) { var html = "
"; html += "
"; - html += label + "
"; + html += label + ""; return html; } + function showUploadProgress(title) { + swal({ + title: title, + text: progressBarHTML('upload-content-progress', 'Upload'), + html: true, + showConfirmButton: false, + allowEscapeKey: false + }); + } + function uploadNextChunk(file, offset) { if (offset == undefined) { offset = 0; @@ -26,7 +36,7 @@ $(document).ready(function(){ var isFinal = Boolean(fileSize - offset <= CHUNK_SIZE); var nextChunkSize = Math.min(fileSize - offset, CHUNK_SIZE); - var chunk = file.slice(offset, offset + CHUNK_SIZE, file.type); + var chunk = file.slice(offset, offset + nextChunkSize, file.type); var chunkFormData = new FormData(); var formItemName = isFinal ? 'restore-file-chunk-final' : 'restore-file-chunk'; @@ -50,6 +60,8 @@ $(document).ready(function(){ ); }); + updateProgressBars($('.upload-content-progress'), Math.round((offset + nextChunkSize) * 100 / fileSize)); + if (!isFinal) { ajaxObject.done(function (data, textStatus, jqXHR) { uploadNextChunk(file, offset + CHUNK_SIZE); }); @@ -102,10 +114,10 @@ $(document).ready(function(){ "Restore content", function() { var files = $('#' + RESTORE_SETTINGS_FILE_ID).prop('files'); + var file = files[0]; - showSpinnerAlert("Uploading content to restore"); - - uploadNextChunk(files[0]); + showUploadProgress("Uploading " + file.name); + uploadNextChunk(file); } ); }); @@ -196,6 +208,11 @@ $(document).ready(function(){ checkBackupStatus(); }); + function updateProgressBars($progressBar, value) { + $progressBar.attr('aria-valuenow', value).attr('style', 'width: ' + value + '%'); + $progressBar.find('.ongoing-msg').html(" " + value + "% Complete"); + } + function reloadBackupInformation() { // make a GET request to get backup information to populate the table $.ajax({ @@ -232,11 +249,6 @@ $(document).ready(function(){ + "
  • Delete
  • "; } - function updateProgressBars($progressBar, value) { - $progressBar.attr('aria-valuenow', value).attr('style', 'width: ' + value + '%'); - $progressBar.find('.sr-only').html(value + "% Complete"); - } - // before we add any new rows and update existing ones // remove our flag for active rows $('.' + ACTIVE_BACKUP_ROW_CLASS).removeClass(ACTIVE_BACKUP_ROW_CLASS);