From 793fa9876a55bd21fe515725107b458b1b416670 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 03 Jul 2014 02:47:49 -0400
Subject: [PATCH] Remove leftover code - fixes js error
---
program/js/treelist.js | 155 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 132 insertions(+), 23 deletions(-)
diff --git a/program/js/treelist.js b/program/js/treelist.js
index 65f5fd4..6a5518a 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -45,7 +45,8 @@
scroll_step: 5,
scroll_speed: 20,
save_state: false,
- check_droptarget: function(node){ return !node.virtual }
+ keyboard: true,
+ check_droptarget: function(node) { return !node.virtual; }
}, p || {});
var container = $(node),
@@ -66,6 +67,7 @@
searchfield,
tree_state,
ui_droppable,
+ ui_draggable,
list_id = (container.attr('id') || p.id_prefix || '0'),
me = this;
@@ -82,6 +84,7 @@
this.drag_end = drag_end;
this.intersects = intersects;
this.droppable = droppable;
+ this.draggable = draggable;
this.update = update_node;
this.insert = insert;
this.remove = remove;
@@ -107,11 +110,25 @@
e.stopPropagation();
});
- container.on('click', 'li', function(e){
+ container.on('click', 'li', function(e) {
+ // do not select record on checkbox/input click
+ if ($(e.target).is('input'))
+ return true;
+
var node = p.selectable ? indexbyid[dom2id($(this))] : null;
if (node && !node.virtual) {
select(node.id);
e.stopPropagation();
+ }
+ });
+
+ // mute clicks on virtual folder links (they need tabindex="0" in order to be selectable by keyboard)
+ container.on('mousedown', 'a', function(e) {
+ var link = $(e.target), node = indexbyid[dom2id(link.closest('li'))];
+ if (node && node.virtual && !link.attr('href')) {
+ e.preventDefault();
+ e.stopPropagation();
+ return false;
}
});
@@ -215,15 +232,24 @@
function select(id)
{
if (selection) {
- id2dom(selection).removeClass('selected').removeAttr('aria-selected');
+ id2dom(selection, true).removeClass('selected').removeAttr('aria-selected');
+ if (search_active)
+ id2dom(selection).removeClass('selected').removeAttr('aria-selected');
selection = null;
}
- var li = id2dom(id);
+ if (!id)
+ return;
+
+ var li = id2dom(id, true);
if (li.length) {
li.addClass('selected').attr('aria-selected', 'true');
selection = id;
// TODO: expand all parent nodes if collapsed
+
+ if (search_active)
+ id2dom(id).addClass('selected').attr('aria-selected', 'true');
+
scroll_to_node(li);
}
@@ -328,14 +354,32 @@
*/
function update_node(id, updates, sort)
{
- var li, node = indexbyid[id];
+ var li, parent_ul, parent_node, old_parent,
+ node = indexbyid[id];
if (node) {
li = id2dom(id);
+ parent_ul = li.parent();
- if (updates.id || updates.html || updates.children || updates.classes) {
+ if (updates.id || updates.html || updates.children || updates.classes || updates.parent) {
+ if (updates.parent && (parent_node = indexbyid[updates.parent])) {
+ // remove reference from old parent's child list
+ if (parent_ul.closest('li').length && (old_parent = indexbyid[dom2id(parent_ul.closest('li'))])) {
+ old_parent.children = $.grep(old_parent.children, function(elem, i){ return elem.id != node.id; });
+ }
+
+ // append to new parent node
+ parent_ul = id2dom(updates.parent).children('ul').first();
+ if (!parent_node.children)
+ parent_node.children = [];
+ parent_node.children.push(node);
+ }
+ else if (updates.parent !== undefined) {
+ parent_ul = container;
+ }
+
$.extend(node, updates);
- render_node(node, li.parent(), li);
+ li = render_node(node, parent_ul, li);
}
if (node.id != id) {
@@ -545,8 +589,11 @@
.addClass((node.classes || []).join(' '))
.data('id', node.id);
- if (replace)
+ if (replace) {
replace.replaceWith(li);
+ if (parent)
+ li.appendTo(parent);
+ }
else
li.appendTo(parent);
@@ -659,7 +706,7 @@
*/
function dom2id(li)
{
- var domid = li.attr('id').replace(new RegExp('^' + (p.id_prefix) || '%'), '').replace(/--xsR$/, '');
+ var domid = String(li.attr('id')).replace(new RegExp('^' + (p.id_prefix) || '%'), '').replace(/--xsR$/, '');
return p.id_decode ? p.id_decode(domid) : domid;
}
@@ -670,6 +717,7 @@
{
var domid = p.id_encode ? p.id_encode(id) : id,
suffix = search_active && !real ? '--xsR' : '';
+
return $('#' + p.id_prefix + domid + suffix, container);
}
@@ -735,11 +783,11 @@
case 40:
case 63232: // 'up', in safari keypress
case 63233: // 'down', in safari keypress
- var li = container.find(':focus').closest('li');
+ var li = p.keyboard ? container.find(':focus').closest('li') : [];
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
@@ -747,10 +795,18 @@
if (li.length) {
id = dom2id(li);
node = indexbyid[id];
- if (node && node.children.length)
+ if (node && node.children.length && node.collapsed != (keyCode == 37))
toggle(id, rcube_event.get_modifier(e) == SHIFT_KEY); // toggle subtree
}
return false;
+
+ case 9: // Tab
+ if (p.keyboard) {
+ // 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';
+ focus_noscroll(container.find('li[role=treeitem]:has(a)')[limit]().find('a:'+limit));
+ }
+ break;
}
return true;
@@ -762,25 +818,37 @@
next = li[mod](), limit, parent;
if (dir > 0 && !from_child && li.children('ul[role=group]:visible').length) {
- li.children('ul').children('li:first').children('a:first').focus();
+ li.children('ul').children('li:first').find('a:first').focus();
}
else if (dir < 0 && !from_child && next.children('ul[role=group]:visible').length) {
- next.children('ul').children('li:last').children('a:last').focus();
+ next.children('ul').children('li:last').find('a:first').focus();
}
- else if (next.length && next.children('a:first')) {
- next.children('a:first').focus();
+ else if (next.length && next.find('a:first').focus().length) {
+ // focused
}
else {
parent = li.parent().closest('li[role=treeitem]');
if (parent.length)
if (dir < 0) {
- parent.children('a:first').focus();
+ parent.find('a:first').focus();
}
else {
focus_next(parent, dir, true);
}
}
->>>>>>> dev-accessibility
+ }
+
+ /**
+ * 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;
+ }
}
@@ -792,6 +860,11 @@
*/
function drag_start()
{
+ if (drag_active)
+ return;
+
+ drag_active = true;
+
var li, item, height,
pos = container.offset();
@@ -799,7 +872,6 @@
list_scroll_top = container.parent().scrollTop();
pos.top += list_scroll_top;
- drag_active = true;
box_coords = {
x1: pos.left,
y1: pos.top,
@@ -862,6 +934,9 @@
*/
function drag_end()
{
+ if (!drag_active)
+ return;
+
drag_active = false;
scroll_timer = null;
@@ -892,7 +967,7 @@
}
/**
- * Determine if the given mouse coords intersect the list and one if its items
+ * Determine if the given mouse coords intersect the list and one of its items
*/
function intersects(mouse, highlight)
{
@@ -912,8 +987,8 @@
}
// check intersection with visible list items
- var pos, node;
- for (var id in item_coords) {
+ var id, pos, node;
+ for (id in item_coords) {
pos = item_coords[id];
if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.top >= pos.y1 && mouse.top < pos.y2) {
node = indexbyid[id];
@@ -966,7 +1041,14 @@
*/
function droppable(opts)
{
- var my_opts = $.extend({ greedy: true, hoverClass: 'droptarget', addClasses:false }, opts);
+ if (!opts) opts = {};
+
+ var my_opts = $.extend({
+ greedy: true,
+ tolerance: 'pointer',
+ hoverClass: 'droptarget',
+ addClasses: false
+ }, opts);
my_opts.activate = function(e, ui) {
drag_start();
@@ -989,6 +1071,33 @@
};
$('li:not(.virtual)', container).droppable(my_opts);
+
+ return this;
+ }
+
+ /**
+ * Wrapper for jQuery.UI.draggable() activation on this widget
+ *
+ * @param object Options as passed to regular .draggable() function
+ */
+ function draggable(opts)
+ {
+ if (!opts) opts = {};
+
+ var my_opts = $.extend({
+ appendTo: 'body',
+ iframeFix: true,
+ addClasses: false,
+ cursorAt: {left: -20, top: 5},
+ helper: function(e) {
+ return $('<div>').attr('id', 'rcmdraglayer')
+ .text($.trim($(e.target).first().text()));
+ }
+ }, opts);
+
+ $('li:not(.virtual)', container).draggable(my_opts);
+
+ return this;
}
}
--
Gitblit v1.9.1