From 2596982f3d589b163f59fc6c4079b39a5f0cdd08 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 4 Jul 2011 11:42:30 +0000
Subject: - Show loading icon event if upload_progress is enabled

git-svn-id: https://svn.roundcube.net/trunk@4903 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v1.2.3