From 0b178f16f1a1139a45cc5478bd2ed3e992a61bc8 Mon Sep 17 00:00:00 2001 From: thomasb Date: Thu, 10 Mar 2011 20:21:21 +0000 Subject: Prepare for multiple concurrent compose windows git-svn-id: https://svn.roundcube.net/trunk@4604 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/js/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'roundcubemail/program/js/app.js') diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index a155653d0..fdd9d9c97 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -227,7 +227,7 @@ function rcube_webmail() } } else if (this.env.action == 'compose') { - this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'toggle-editor']; + this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor']; if (this.env.drafts_mailbox) this.env.compose_commands.push('savedraft') @@ -3270,7 +3270,7 @@ function rcube_webmail() this.remove_attachment = function(name) { if (name && this.env.attachments[name]) - this.http_post('remove-attachment', '_file='+urlencode(name)); + this.http_post('remove-attachment', { _id:this.env.compose_id, _file:name }); return true; }; @@ -5408,7 +5408,7 @@ function rcube_webmail() $(frame_name).bind('load', {ts:ts}, onload); form.target = frame_name; - form.action = this.url(action, { _uploadid:ts }); + form.action = this.url(action, { _id:this.env.compose_id||'', _uploadid:ts }); form.setAttribute('enctype', 'multipart/form-data'); form.submit(); -- cgit v1.2.3