From 42f8abac460f06613e2da92820bc6d6d7106cac3 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Jun 2015 13:26:47 -0400
Subject: [PATCH] Fix "Importing..." message does not hide on error (#1490422)
---
CHANGELOG | 1 +
program/js/app.js | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 6090318..8f89e4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
- 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
-------------
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 @@
$('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 @@
};
// upload (attachment) file
- this.upload_file = function(form, action)
+ this.upload_file = function(form, action, lock)
{
if (!form)
return;
@@ -4221,6 +4221,9 @@
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)
--
Gitblit v1.9.1