summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-07-04 11:42:30 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-07-04 11:42:30 +0000
commit2596982f3d589b163f59fc6c4079b39a5f0cdd08 (patch)
tree34a07d2ff8de8305e5ee90ce2c7ead925a95ae9a /roundcubemail/program
parenta07a1ac63ad984de9b8b36dee4ad8ea9824b6b7b (diff)
- Show loading icon event if upload_progress is enabled
git-svn-id: https://svn.roundcube.net/trunk@4903 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/js/app.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index f3298cfac..5a9ed219d 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/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;