diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-06-16 12:41:09 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-06-16 12:41:09 +0200 |
| commit | eb82b35df9807d0e002b9fd676692d51d007b319 (patch) | |
| tree | 408305686cf896bcf991a64bd38ac2a18bf69087 /program | |
| parent | 769829a0cec6198fedf8dd937b123377cb45510d (diff) | |
| parent | 9749aeeb0bda83019c1872a72d438a19f9cb3085 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program')
| -rw-r--r-- | program/js/app.js | 2 | ||||
| -rw-r--r-- | program/js/treelist.js | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/program/js/app.js b/program/js/app.js index ea7be4eac..82b69c4db 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1677,7 +1677,7 @@ function rcube_webmail() case 63232: // "up", in safari keypress case 63233: // "down", in safari keypress focus_menu_item(keyCode == 38 || keyCode == 63232 ? -1 : 1); - break; + return rcube_event.cancel(e); case 9: // tab if (this.focused_menu) { diff --git a/program/js/treelist.js b/program/js/treelist.js index cce4d17fd..1427c2480 100644 --- a/program/js/treelist.js +++ b/program/js/treelist.js @@ -739,7 +739,7 @@ function rcube_treelist_widget(node, p) if (li.length) { focus_next(li, (mod = keyCode == 38 || keyCode == 63232 ? -1 : 1)); } - break; + return rcube_event.cancel(e); case 37: // Left arrow key case 39: // Right arrow key @@ -755,7 +755,7 @@ function rcube_treelist_widget(node, p) case 9: // 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'; - 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; } @@ -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 |