Merge branch 'master' of github.com:roundcube/roundcubemail

pull/198/head
Aleksander Machniak 11 years ago
commit eb82b35df9

@ -1677,7 +1677,7 @@ function rcube_webmail()
case 63232: // "up", in safari keypress case 63232: // "up", in safari keypress
case 63233: // "down", in safari keypress case 63233: // "down", in safari keypress
focus_menu_item(keyCode == 38 || keyCode == 63232 ? -1 : 1); focus_menu_item(keyCode == 38 || keyCode == 63232 ? -1 : 1);
break; return rcube_event.cancel(e);
case 9: // tab case 9: // tab
if (this.focused_menu) { if (this.focused_menu) {

@ -739,7 +739,7 @@ function rcube_treelist_widget(node, p)
if (li.length) { if (li.length) {
focus_next(li, (mod = keyCode == 38 || keyCode == 63232 ? -1 : 1)); focus_next(li, (mod = keyCode == 38 || keyCode == 63232 ? -1 : 1));
} }
break; return rcube_event.cancel(e);
case 37: // Left arrow key case 37: // Left arrow key
case 39: // Right arrow key case 39: // Right arrow key
@ -755,7 +755,7 @@ function rcube_treelist_widget(node, p)
case 9: // Tab case 9: // Tab
// jump to last/first item to move focus away from the treelist widget by tab // jump to last/first item to move focus away from the treelist widget by tab
var limit = rcube_event.get_modifier(e) == SHIFT_KEY ? 'first' : 'last'; var limit = rcube_event.get_modifier(e) == SHIFT_KEY ? 'first' : 'last';
container.find('li[role=treeitem]:has(a)')[limit]().find('a:'+limit).focus(); focus_noscroll(container.find('li[role=treeitem]:has(a)')[limit]().find('a:'+limit));
break; break;
} }
@ -788,6 +788,19 @@ function rcube_treelist_widget(node, p)
} }
} }
/**
* Focus the given element without scrolling the list container
*/
function focus_noscroll(elem)
{
if (elem.length) {
var frame = container.parent().get(0) || { scrollTop:0 },
y = frame.scrollTop || frame.scrollY;
elem.focus();
frame.scrollTop = y;
}
}
///// drag & drop support ///// drag & drop support

@ -492,7 +492,7 @@ table.messagelist.fixedcopy {
.messagelist tr > .flag, .messagelist tr > .flag,
.messagelist tr > .priority { .messagelist tr > .priority {
width: 20px; width: 20px;
padding: 2px 3px; padding: 2px 3px !important;
} }
.webkit .messagelist tr > .attachment, .webkit .messagelist tr > .attachment,
@ -512,7 +512,7 @@ table.messagelist.fixedcopy {
} }
.messagelist tr > .threads, .messagelist tr > .threads,
.messagelist tr > .threads + td { .messagelist tr > .threads + th {
border-left: 0; border-left: 0;
} }

Loading…
Cancel
Save