summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js6
-rw-r--r--program/js/editor_images.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/program/js/app.js b/program/js/app.js
index a155653d0..fdd9d9c97 100644
--- a/program/js/app.js
+++ b/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();
diff --git a/program/js/editor_images.js b/program/js/editor_images.js
index 2faafd339..28e6bec38 100644
--- a/program/js/editor_images.js
+++ b/program/js/editor_images.js
@@ -7,6 +7,6 @@ if (rc_client.env.attachments)
{
var att = rc_client.env.attachments[id];
if (att.complete && att.mimetype.indexOf('image/') == 0)
- tinyMCEImageList.push([att.name, rc_client.env.comm_path+'&_action=display-attachment&_file='+id]);
+ tinyMCEImageList.push([att.name, rc_client.env.comm_path+'&_action=display-attachment&_file='+id+'&_id='+rc_client.env.compose_id]);
}
};