From 85fd2921f4bcc102be4b031cc726e5055808deb6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 6 Apr 2012 11:26:04 +0000
Subject: - Fix some issues regarding to cancel icon on attachments list,
 improve delete icon handling

---
 program/js/app.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'program/js/app.js')

diff --git a/program/js/app.js b/program/js/app.js
index 53a67c7ad..5fe97c9fd 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -959,7 +959,7 @@ function rcube_webmail()
       case 'send-attachment':
         // Reset the auto-save timer
         self.clearTimeout(this.save_timer);
-        
+
         this.upload_file(props || this.gui_objects.uploadform);
         break;
 
@@ -3443,8 +3443,9 @@ function rcube_webmail()
 
       if (this.env.loadingicon)
         content = '<img src="'+this.env.loadingicon+'" alt="" class="uploading" />'+content;
-      if (this.env.cancelicon)
-        content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload" class="cancelupload"><img src="'+this.env.cancelicon+'" alt="" /></a>'+content;
+      content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload" class="cancelupload">'
+        + (this.env.cancelicon ? '<img src="'+this.env.cancelicon+'" alt="" />' : this.get_label('cancel')) + '</a>' + content;
+
       this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false });
 
       // upload progress support
-- 
cgit v1.2.3