diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-04-06 11:26:04 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-04-06 11:26:04 +0000 |
| commit | 7ccf9eff68e325a1976d3faee036ec657eecdd91 (patch) | |
| tree | e12328253a2f06350a8fb086ae4638da3658485b /roundcubemail/program/js/app.js | |
| parent | 3adf9354c23ade0d115f205e31006cd80ffd4944 (diff) | |
- Fix some issues regarding to cancel icon on attachments list, improve delete icon handling
git-svn-id: https://svn.roundcube.net/trunk@6045 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/js/app.js')
| -rw-r--r-- | roundcubemail/program/js/app.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index 53a67c7ad..5fe97c9fd 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/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 |