From 9fa8368b01b9cee5fcc97d9c267e2308296501e2 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 30 Jun 2014 07:56:06 -0400
Subject: [PATCH] Support images drag-n-drop into image browser dialog in html signature editor
---
program/js/editor.js | 110 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 18 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 3b0621f..3b49968 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -65,17 +65,19 @@
// minimal editor
if (config.mode == 'identity') {
$.extend(conf, {
- plugins: ['autolink charmap code hr link paste tabfocus textcolor'],
+ plugins: 'autolink charmap code colorpicker hr image link paste tabfocus textcolor',
toolbar: 'bold italic underline alignleft aligncenter alignright alignjustify'
- + ' | outdent indent charmap hr link unlink code forecolor'
- + ' | fontselect fontsizeselect'
+ + ' | outdent indent charmap hr link unlink image code forecolor'
+ + ' | fontselect fontsizeselect',
+ file_browser_callback: function(name, url, type, win) { ref.file_browser_callback(name, url, type); },
+ file_browser_callback_types: 'image'
});
}
// full-featured editor
else {
$.extend(conf, {
- plugins: ['autolink charmap code directionality emoticons link image media nonbreaking'
- + ' paste table tabfocus textcolor searchreplace' + (config.spellcheck ? ' spellchecker' : '')],
+ plugins: 'autolink charmap code colorpicker directionality emoticons link image media nonbreaking'
+ + ' paste table tabfocus textcolor searchreplace' + (config.spellcheck ? ' spellchecker' : ''),
toolbar: 'bold italic underline | alignleft aligncenter alignright alignjustify'
+ ' | bullist numlist outdent indent ltr rtl blockquote | forecolor backcolor | fontselect fontsizeselect'
+ ' | link unlink table | emoticons charmap image media | code searchreplace undo redo',
@@ -523,7 +525,7 @@
// image selector
this.file_browser_callback = function(field_name, url, type)
{
- var i, elem, dialog, list = [];
+ var i, elem, cancel, dialog, fn, list = [];
// open image selector dialog
dialog = this.editor.windowManager.open({
@@ -531,7 +533,7 @@
width: 500,
height: 300,
html: '<div id="image-selector-list"><ul></ul></div>'
- + '<div id="image-selector-form"><div id="image-upload-button" class="mce-widget mce-btn" role="button"></div></div>',
+ + '<div id="image-selector-form"><div id="image-upload-button" class="mce-widget mce-btn" role="button" tabindex="0"></div></div>',
buttons: [{text: 'Cancel', onclick: function() { ref.file_browser_close(); }}]
});
@@ -546,19 +548,55 @@
}
if (list.length) {
- $('#image-selector-list > ul').append(list);
+ $('#image-selector-list > ul').append(list).find('li:first').focus();
}
// add hint about max file size (in dialog footer)
- $('div.mce-abs-end', dialog.getEl()).append($('<div class="hint">').text($('div.hint', rcmail.gui_objects.uploadform).text()));
+ $('div.mce-abs-end', dialog.getEl()).append($('<div class="hint">')
+ .text($('div.hint', rcmail.gui_objects.uploadform).text()));
+
+ // init upload button
+ elem = $('#image-upload-button').append($('<span>').text(rcmail.gettext('add' + type)));
+ cancel = elem.parents('.mce-panel').find('button:last').parent();
+
+ // we need custom Tab key handlers, until we find out why
+ // tabindex do not work here as expected
+ elem.keydown(function(e) {
+ if (e.which == 9) {
+ // on Tab + Shift focus first file
+ if (rcube_event.get_modifier(e) == SHIFT_KEY)
+ $('#image-selector-list li:last').focus();
+ // on Tab focus Cancel button
+ else
+ cancel.focus();
+
+ return false;
+ }
+ });
+ cancel.keydown(function(e) {
+ if (e.which == 9) {
+ // on Tab + Shift focus upload button
+ if (rcube_event.get_modifier(e) == SHIFT_KEY)
+ elem.focus();
+ else
+ $('#image-selector-list li:first').focus();
+
+ return false;
+ }
+ });
// enable (smart) upload button
- elem = $('#image-upload-button').append($('<span>').text(rcmail.gettext('add' + type)));
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) {
@@ -576,18 +614,25 @@
var elem;
if (elem = ref.file_browser_entry(attr.name, attr.attachment)) {
$('#image-selector-list > ul').prepend(elem);
+ elem.focus();
}
});
}
+
+ // @todo: upload progress indicator
};
// close file browser window
this.file_browser_close = function(url)
{
+ var input = $('#' + rcmail.env.file_browser_field);
+
if (url)
- $('#' + rcmail.env.file_browser_field).val(url);
+ input.val(url);
this.editor.windowManager.close();
+
+ input.focus();
if (rcmail.env.old_file_drop)
rcmail.gui_objects.filedrop = rcmail.env.old_file_drop;
@@ -598,6 +643,10 @@
{
if (!file.complete || !file.mimetype) {
return;
+ }
+
+ if (rcmail.file_upload_id) {
+ rcmail.set_busy(false, null, rcmail.file_upload_id);
}
var rx, img_src;
@@ -617,13 +666,35 @@
}
if (rx.test(file.mimetype)) {
- var href = rcmail.env.comm_path+'&_id='+rcmail.env.compose_id+'&_action=display-attachment&_file='+file_id,
+ var path = rcmail.env.comm_path + '&_from=' + rcmail.env.action,
+ action = rcmail.env.compose_id ? '&_id=' + rcmail.env.compose_id + '&_action=display-attachment' : '&_action=upload-display',
+ href = path + action + '&_file=' + file_id,
img = $('<img>').attr({title: file.name, src: img_src ? img_src : href + '&_thumbnail=1'});
- return $('<li>').data('url', href)
+ return $('<li>').attr({tabindex: 0})
+ .data('url', href)
.append($('<span class="img">').append(img))
.append($('<span class="name">').text(file.name))
- .click(function() { ref.file_browser_close($(this).data('url')); });
+ .click(function() { ref.file_browser_close($(this).data('url')); })
+ .keydown(function(e) {
+ if (e.which == 13) {
+ ref.file_browser_close($(this).data('url'));
+ }
+ // we need custom Tab key handlers, until we find out why
+ // tabindex do not work here as expected
+ else if (e.which == 9) {
+ if (rcube_event.get_modifier(e) == SHIFT_KEY) {
+ if (!$(this).prev().focus().length)
+ $('#image-upload-button').parents('.mce-panel').find('button:last').parent().focus();
+ }
+ else {
+ if (!$(this).next().focus().length)
+ $('#image-upload-button').focus();
+ }
+
+ return false;
+ }
+ });
}
};
@@ -631,7 +702,7 @@
this.hack_file_input = function(elem, clone_form)
{
var link = $(elem),
- file = $('<input>'),
+ file = $('<input>').attr('name', '_file[]'),
form = $('<form>').attr({method: 'post', enctype: 'multipart/form-data'}),
offset = link.offset();
@@ -646,7 +717,7 @@
file.css({top: (e.pageY - offset.top - 10) + 'px', left: (e.pageX - offset.left - 10) + 'px'});
}
- file.attr({type: 'file', multiple: 'multiple', size: 5, title: ''})
+ file.attr({type: 'file', multiple: 'multiple', size: 5, title: '', tabindex: -1})
.change(function() { rcmail.upload_file(form, 'upload'); })
.click(function() { setTimeout(function() { link.mouseleave(); }, 20); })
// opacity:0 does the trick, display/visibility doesn't work
@@ -681,6 +752,9 @@
file.trigger(e);
}
})
+ .keydown(function(e) {
+ if (e.which == 13) file.trigger('click');
+ })
.mouseleave()
.append(form);
};
--
Gitblit v1.9.1