diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-06-30 13:56:06 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-06-30 13:56:06 +0200 |
| commit | 9fa8368b01b9cee5fcc97d9c267e2308296501e2 (patch) | |
| tree | ba0cf4f1631aca46b32c277cf46665e57efd7663 /program/js | |
| parent | 5312b71126c0d1286a2d1c0788dd2636679a1746 (diff) | |
Support images drag-n-drop into image browser dialog in html signature editor
Diffstat (limited to 'program/js')
| -rw-r--r-- | program/js/app.js | 2 | ||||
| -rw-r--r-- | program/js/editor.js | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/program/js/app.js b/program/js/app.js index 3b5ff0422..db9a2ff5f 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -7629,7 +7629,7 @@ function rcube_webmail() $.ajax({ type: 'POST', dataType: 'json', - url: ref.url(ref.env.filedrop.action||'upload', { _id:ref.env.compose_id||ref.env.cid||'', _uploadid:ts, _remote:1 }), + url: ref.url(ref.env.filedrop.action || 'upload', {_id: ref.env.compose_id||ref.env.cid||'', _uploadid: ts, _remote: 1, _from: ref.env.action}), contentType: formdata ? false : 'multipart/form-data; boundary=' + boundary, processData: false, timeout: 0, // disable default timeout set in ajaxSetup() diff --git a/program/js/editor.js b/program/js/editor.js index 0dd8fef9a..3b49968a7 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -589,8 +589,14 @@ function rcube_text_editor(config, id) this.hack_file_input(elem, rcmail.gui_objects.uploadform); // enable drag-n-drop area - if (rcmail.gui_objects.filedrop && rcmail.env.filedrop && ((window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary) || window.FormData)) { - rcmail.env.old_file_drop = rcmail.gui_objects.filedrop; + if ((window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary) || window.FormData) { + if (!rcmail.env.filedrop) { + rcmail.env.filedrop = {}; + } + if (rcmail.gui_objects.filedrop) { + rcmail.env.old_file_drop = rcmail.gui_objects.filedrop; + } + rcmail.gui_objects.filedrop = $('#image-selector-form'); rcmail.gui_objects.filedrop.addClass('droptarget') .bind('dragover dragleave', function(e) { @@ -639,6 +645,10 @@ function rcube_text_editor(config, id) return; } + if (rcmail.file_upload_id) { + rcmail.set_busy(false, null, rcmail.file_upload_id); + } + var rx, img_src; switch (rcmail.env.file_browser_type) { @@ -692,7 +702,7 @@ function rcube_text_editor(config, id) this.hack_file_input = function(elem, clone_form) { var link = $(elem), - file = $('<input>').attr('name', '_files[]'), + file = $('<input>').attr('name', '_file[]'), form = $('<form>').attr({method: 'post', enctype: 'multipart/form-data'}), offset = link.offset(); |