From 782a86e49780a2720890f51c48e161f7052510c4 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 12 May 2014 04:42:34 -0400
Subject: [PATCH] Fix treelist keyboard navigation + assign aria-level attributes to treeitems
---
program/js/treelist.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/program/js/treelist.js b/program/js/treelist.js
index 8b55b32..4cffdac 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -209,6 +209,7 @@
// insert as child of an existing node
if (parent_node) {
+ node.level = parent_node.level + 1;
if (!parent_node.children)
parent_node.children = [];
@@ -227,6 +228,7 @@
}
// insert at top level
else {
+ node.level = 0;
data.push(node);
li = render_node(node, container);
}
@@ -365,6 +367,7 @@
// render child nodes
for (var i=0; i < data.length; i++) {
+ data[i].level = 0;
render_node(data[i], container);
}
@@ -408,6 +411,7 @@
ul.hide();
for (var i=0; i < node.children.length; i++) {
+ node.children[i].level = node.level + 1;
render_node(node.children[i], ul);
}
}
@@ -428,6 +432,7 @@
id: dom2id(li),
classes: li.attr('class').split(' '),
virtual: li.hasClass('virtual'),
+ level: level,
html: li.children().first().get(0).outerHTML,
children: walk_list(sublist, level+1)
}
@@ -445,7 +450,7 @@
}
// declare list item as treeitem
- li.attr('role', 'treeitem');
+ li.attr('role', 'treeitem').attr('aria-level', node.level+1);
// allow virtual nodes to receive focus
if (node.virtual) {
@@ -547,10 +552,10 @@
var mod = dir < 0 ? 'prev' : 'next',
next = li[mod](), limit, parent;
- if (dir > 0 && !from_child && li.children('ul[role=tree]:visible').length) {
+ if (dir > 0 && !from_child && li.children('ul[role=group]:visible').length) {
li.children('ul').children('li:first').children('a:first').focus();
}
- else if (dir < 0 && !from_child && next.children('ul[role=tree]:visible').length) {
+ else if (dir < 0 && !from_child && next.children('ul[role=group]:visible').length) {
next.children('ul').children('li:last').children('a:last').focus();
}
else if (next.length && next.children('a:first')) {
--
Gitblit v1.9.1