summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-07-04 11:42:30 +0000
committeralecpl <alec@alec.pl>2011-07-04 11:42:30 +0000
commit7da13a337eb1d0ebbe4eadf8d0e32f848566c728 (patch)
tree8d6e333f80b0bae3bfd9aa71c2eb41aaf30d23a9 /program/js
parent4171c59bd79a54c1fd65128f7100247a4dec8720 (diff)
- Show loading icon event if upload_progress is enabled
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/js/app.js b/program/js/app.js
index f3298cfac..5a9ed219d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3267,7 +3267,7 @@ function rcube_webmail()
var content = '<span>' + this.get_label('uploading' + (files > 1 ? 'many' : '')) + '</span>',
ts = frame_name.replace(/^rcmupload/, '');
- if (!this.env.upload_progress_time && this.env.loadingicon)
+ if (this.env.loadingicon)
content = '<img src="'+this.env.loadingicon+'" alt="" />'+content;
if (this.env.cancelicon)
content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload"><img src="'+this.env.cancelicon+'" alt="" /></a>'+content;