"Importing..." message does not hide on error

[rcubetrac]

Reported by @alecpl on 4 Jun 2015 18:13 UTC as Trac ticket #1490422

When messages upload fails the "Importing, please wait..." message does not disappear. Following patch fies the issue:

diff --git a/program/js/app.js b/program/js/app.js
index dc5c8c1..b3e4632 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1268,7 +1268,7 @@ function rcube_webmail()

         $('input[name="_unlock"]', form).val(importlock);

-        if (!(flag = this.upload_file(form, 'import'))) {
+        if (!(flag = this.upload_file(form, 'import', importlock))) {
           this.set_busy(false, null, importlock);
           if (flag !== false)
             alert(this.get_label('selectimportfile'));
@@ -4179,7 +4179,7 @@ function rcube_webmail()
   };

   // upload (attachment) file
-  this.upload_file = function(form, action)
+  this.upload_file = function(form, action, lock)
   {
     if (!form)
       return;
@@ -4221,6 +4221,9 @@ function rcube_webmail()
           if (!content.match(/display_message/))
             ref.display_message(ref.get_label('fileuploaderror'), 'error');
           ref.remove_from_attachment_list(e.data.ts);
+
+          if (lock)
+            ref.set_busy(false, null, lock);
         }
         // Opera hack: handle double onload
         if (bw.opera)

Migrated-From: http://trac.roundcube.net/ticket/1490422

[rcubetrac]

Comment by @alecpl on 5 Jun 2015 17:28 UTC

Fixed in 42f8aba.

[rcubetrac]

Status changed by @alecpl on 5 Jun 2015 17:28 UTC

new => closed