archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

File Upload: Don't clear all upload toastr notifications

Browse Source 
Define the toastr on setup and clear only that one once it's finished
This commit is contained in:
Pablo Vazquez
2017-11-10 17:57:17 +01:00
parent 0cea8d622d
commit 3466320d98
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/scripts/file_upload.js
View File

@@ -35,6 +35,7 @@ function setup_file_uploader(index, upload_element) {
var $upload_element = $(upload_element); var $upload_element = $(upload_element);
var container = $upload_element.parent().parent(); var container = $upload_element.parent().parent();
var progress_bar = container.find('div.form-upload-progress-bar'); var progress_bar = container.find('div.form-upload-progress-bar');
var toastrUpload;
function set_progress_bar(progress, html_class) { function set_progress_bar(progress, html_class) {
progress_bar.css({ progress_bar.css({
@@ -53,7 +54,9 @@ function setup_file_uploader(index, upload_element) {
beforeSend: function (xhr, data) { beforeSend: function (xhr, data) {
var token = this.fileInput.attr('data-token'); var token = this.fileInput.attr('data-token');
xhr.setRequestHeader('Authorization', 'basic ' + btoa(token + ':')); xhr.setRequestHeader('Authorization', 'basic ' + btoa(token + ':'));
toastr.info('Uploading file...');
toastrUpload = toastr.info('Uploading file...', '', {'timeOut': 0});
toastrUpload;
// console.log('Uploading from', upload_element, upload_element.value); // console.log('Uploading from', upload_element, upload_element.value);
@@ -114,8 +117,8 @@ function setup_file_uploader(index, upload_element) {
$('.node-edit-title').html(filename); $('.node-edit-title').html(filename);
} }
toastr.clear(); toastr.clear(toastrUpload);
toastr.success('File uploaded!'); toastr.success('File uploaded!', '', {'progressBar': false});
set_progress_bar(100); set_progress_bar(100);
$('body').trigger('file-upload:finished'); $('body').trigger('file-upload:finished');
@@ -132,7 +135,7 @@ function setup_file_uploader(index, upload_element) {
uploadErrors.push(fileupload.messages[key]); uploadErrors.push(fileupload.messages[key]);
} }
toastr.clear(); toastr.clear(toastrUpload);
toastr.error(uploadErrors.join("; "), 'Upload error'); toastr.error(uploadErrors.join("; "), 'Upload error');
set_progress_bar(100, 'progress-error'); set_progress_bar(100, 'progress-error');