From 47788a7c10ce225e5c133350dfc2ef2030a68090 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 24 Jun 2014 04:13:28 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
CHANGELOG | 1
program/js/tinymce/roundcube/browser.css | 3 +
program/js/editor.js | 76 +++++++++++++++++++++++++++++++++----
program/js/app.js | 13 +++++-
skins/larry/mail.css | 2
skins/larry/ui.js | 3 +
6 files changed, 85 insertions(+), 13 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 43c2504..2239fcf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Mail compose: Selecting contact inserts recipient to previously focused input - to/cc/bcc accordingly (#1489684)
- Add option to set default message list mode - default_list_mode (#1487312)
- Close "no subject" prompt with Enter key (#1489580)
- Add config option to specify IMAP connection socket parameters - imap_conn_options (#1489948)
diff --git a/program/js/app.js b/program/js/app.js
index b4a2250..61698b8 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -346,10 +346,10 @@
this.contact_list
.addEventListener('initrow', function(o) { ref.triggerEvent('insertrow', { cid:o.uid, row:o }); })
.addEventListener('select', function(o) { ref.compose_recipient_select(o); })
- .addEventListener('dblclick', function(o) { ref.compose_add_recipient('to'); })
+ .addEventListener('dblclick', function(o) { ref.compose_add_recipient(); })
.addEventListener('keypress', function(o) {
if (o.key_pressed == o.ENTER_KEY) {
- if (!ref.compose_add_recipient('to')) {
+ if (!ref.compose_add_recipient()) {
// execute link action on <enter> if not a recipient entry
if (o.last_selected && String(o.last_selected).charAt(0) == 'G') {
$(o.rows[o.last_selected].obj).find('a').first().click();
@@ -358,6 +358,9 @@
}
})
.init();
+
+ // remember last focused address field
+ $('#_to,#_cc,#_bcc').focus(function() { ref.env.focused_field = this; });
}
if (this.gui_objects.addressbookslist) {
@@ -3485,6 +3488,12 @@
this.compose_add_recipient = function(field)
{
+ // find last focused field name
+ if (!field) {
+ field = $(this.env.focused_field).filter(':visible');
+ field = field.length ? field.attr('id').replace('_', '') : 'to';
+ }
+
var recipients = [], input = $('#_'+field), delim = this.env.recipients_delimiter;
if (this.contact_list && this.contact_list.selection.length) {
diff --git a/program/js/editor.js b/program/js/editor.js
index c5680ed..dfd3e27 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -523,7 +523,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 +531,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,14 +546,44 @@
}
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
@@ -576,6 +606,7 @@
var elem;
if (elem = ref.file_browser_entry(attr.name, attr.attachment)) {
$('#image-selector-list > ul').prepend(elem);
+ elem.focus();
}
});
}
@@ -584,10 +615,14 @@
// 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;
@@ -620,10 +655,30 @@
var href = rcmail.env.comm_path+'&_id='+rcmail.env.compose_id+'&_action=display-attachment&_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;
+ }
+ });
}
};
@@ -646,7 +701,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 +736,9 @@
file.trigger(e);
}
})
+ .keydown(function(e) {
+ if (e.which == 13) file.trigger('click');
+ })
.mouseleave()
.append(form);
};
diff --git a/program/js/tinymce/roundcube/browser.css b/program/js/tinymce/roundcube/browser.css
index 1787226..d756c11 100644
--- a/program/js/tinymce/roundcube/browser.css
+++ b/program/js/tinymce/roundcube/browser.css
@@ -42,7 +42,8 @@
text-overflow: ellipsis;
}
-#image-selector-list li:hover {
+#image-selector-list li:hover,
+#image-selector-list li:focus {
background-color: #F0F0F0;
}
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 5e2677f..dfda7f4 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -511,7 +511,7 @@
width: 30px;
}
-.messagelist tr > .threads,
+.messagelist tr > .threads + td,
.messagelist tr > .threads + th {
border-left: 0;
}
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index eb9569f..11125c3 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -1019,7 +1019,10 @@
row.show();
$('#' + which + '-link').hide();
+
layout_composeview();
+ $('input,textarea', row).focus();
+
return false;
}
--
Gitblit v1.9.1