Fix "Importing..." message does not hide on error (#1490422)

pull/281/head
Aleksander Machniak 10 years ago
parent c5ca818118
commit 42f8abac46

@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
- Plugin API: Add special onload() method to execute plugin actions before startup (session and GUI initialization)
- Implemented UI element to jump to specified page of the messages list (#1485235)
- Fix so unrecognized TNEF attachments are displayed on the list of attachments (#1490351)
- Fix "Importing..." message does not hide on error (#1490422)
RELEASE 1.1.2
-------------

@ -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)

Loading…
Cancel
Save