From 3466320d98b0268e1174f47c10cbc88d1cc076f7 Mon Sep 17 00:00:00 2001
From: Pablo Vazquez <venomgfx@gmail.com>
Date: Fri, 10 Nov 2017 17:57:17 +0100
Subject: [PATCH] File Upload: Don't clear all upload toastr notifications

Define the toastr on setup and clear only that one once it's finished
---
 src/scripts/file_upload.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/scripts/file_upload.js b/src/scripts/file_upload.js
index 82357899..ccfe0419 100644
--- a/src/scripts/file_upload.js
+++ b/src/scripts/file_upload.js
@@ -35,6 +35,7 @@ function setup_file_uploader(index, upload_element) {
     var $upload_element = $(upload_element);
     var container = $upload_element.parent().parent();
     var progress_bar = container.find('div.form-upload-progress-bar');
+    var toastrUpload;
 
     function set_progress_bar(progress, html_class) {
         progress_bar.css({
@@ -53,7 +54,9 @@ function setup_file_uploader(index, upload_element) {
         beforeSend: function (xhr, data) {
             var token = this.fileInput.attr('data-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);
 
@@ -114,8 +117,8 @@ function setup_file_uploader(index, upload_element) {
                 $('.node-edit-title').html(filename);
             }
 
-            toastr.clear();
-            toastr.success('File uploaded!');
+            toastr.clear(toastrUpload);
+            toastr.success('File uploaded!', '', {'progressBar': false});
             set_progress_bar(100);
 
             $('body').trigger('file-upload:finished');
@@ -132,7 +135,7 @@ function setup_file_uploader(index, upload_element) {
                 uploadErrors.push(fileupload.messages[key]);
             }
 
-            toastr.clear();
+            toastr.clear(toastrUpload);
             toastr.error(uploadErrors.join("; "), 'Upload error');
 
             set_progress_bar(100, 'progress-error');