From bc2accc455e1dab67e0d29f034deddd9401ecad2 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 25 Mar 2010 14:16:50 -0400
Subject: [PATCH] - Added Home/End kayboard keys support on lists (#1486430)
---
program/js/list.js | 116 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 24 deletions(-)
diff --git a/program/js/list.js b/program/js/list.js
index 2c53998..13fa7d3 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -320,6 +320,20 @@
},
+/*
+ * Returns thread root ID for specified row ID
+ */
+find_root: function(uid)
+{
+ var r = this.rows[uid];
+
+ if (r && r.parent_uid)
+ return this.find_root(r.parent_uid);
+ else
+ return uid;
+},
+
+
expand_row: function(e, id)
{
var row = this.rows[id];
@@ -379,6 +393,7 @@
row.expanded = true;
depth = row.depth;
new_row = row.obj.nextSibling;
+ this.update_expando(row.uid, true);
this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded });
}
else {
@@ -427,6 +442,7 @@
row.expanded = false;
depth = row.depth;
new_row = row.obj.nextSibling;
+ this.update_expando(row.uid);
this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded });
// don't collapse sub-root tree in multiexpand mode
@@ -450,9 +466,7 @@
$(new_row).hide();
if (r.has_children) {
r.expanded = false;
- var expando = document.getElementById('rcmexpando' + r.uid);
- if (expando)
- expando.className = 'collapsed';
+ this.update_expando(r.uid);
this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded });
}
}
@@ -472,6 +486,7 @@
row.expanded = true;
depth = row.depth;
new_row = row.obj.nextSibling;
+ this.update_expando(row.uid, true);
this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded });
}
else {
@@ -490,9 +505,7 @@
$(new_row).show();
if (r.has_children) {
r.expanded = true;
- var expando = document.getElementById('rcmexpando' + r.uid);
- if (expando)
- expando.className = 'expanded';
+ this.update_expando(r.uid, true);
this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded });
}
}
@@ -501,6 +514,14 @@
}
return false;
},
+
+update_expando: function(uid, expanded)
+{
+ var expando = document.getElementById('rcmexpando' + uid);
+ if (expando)
+ expando.className = expanded ? 'expanded' : 'collapsed';
+},
+
/**
* get first/next/previous/last rows that are not hidden
@@ -648,14 +669,60 @@
this.select_row(new_row.uid, false, false);
},
+
/**
* Select first row
*/
-select_first: function()
+select_first: function(mod_key)
{
- var first_row = this.get_first_row();
- if (first_row)
- this.select_row(first_row, false, false);
+ var row = this.get_first_row();
+ if (row && mod_key) {
+ this.shift_select(row, mod_key);
+ this.triggerEvent('select');
+ this.scrollto(row);
+ }
+ else if (row)
+ this.select(row);
+},
+
+
+/**
+ * Select last row
+ */
+select_last: function(mod_key)
+{
+ var row = this.get_last_row();
+ if (row && mod_key) {
+ this.shift_select(row, mod_key);
+ this.triggerEvent('select');
+ this.scrollto(row);
+ }
+ else if (row)
+ this.select(row);
+},
+
+
+/**
+ * Add all childs of the given row to selection
+ */
+select_childs: function(uid)
+{
+ if (!this.rows[uid] || !this.rows[uid].has_children)
+ return;
+
+ var depth = this.rows[uid].depth;
+ var row = this.rows[uid].obj.nextSibling;
+ while (row) {
+ if (row.nodeType == 1) {
+ if ((r = this.rows[row.uid])) {
+ if (!r.depth || r.depth <= depth)
+ break;
+ if (!this.in_selection(r.uid))
+ this.select_row(r.uid, CONTROL_KEY);
+ }
+ }
+ row = row.nextSibling;
+ }
},
@@ -880,6 +947,12 @@
this.key_pressed = keyCode;
this.triggerEvent('keypress');
return ret;
+ case 36: // Home
+ this.select_first(mod_key);
+ return rcube_event.cancel(e);
+ case 35: // End
+ this.select_last(mod_key);
+ return rcube_event.cancel(e);
default:
this.shiftkey = e.shiftKey;
this.key_pressed = keyCode;
@@ -984,6 +1057,13 @@
{
var scroll_to = Number(row.offsetTop);
+ // expand thread if target row is hidden (collapsed)
+ if (!scroll_to && this.rows[id].parent_uid) {
+ var parent = this.find_root(this.rows[id].uid);
+ this.expand_all(this.rows[parent]);
+ scroll_to = Number(row.offsetTop);
+ }
+
if (scroll_to < Number(this.frame.scrollTop))
this.frame.scrollTop = scroll_to;
else if (scroll_to + Number(row.offsetHeight) > Number(this.frame.scrollTop) + Number(this.frame.offsetHeight))
@@ -1013,20 +1093,8 @@
var depth, row, uid, r;
for (var n=0; n < selection.length; n++) {
uid = selection[n];
- if (this.rows[uid].has_children /*&& !this.rows[uid].expanded*/) {
- depth = this.rows[uid].depth;
- row = this.rows[uid].obj.nextSibling;
- while (row) {
- if (row.nodeType == 1) {
- if ((r = this.rows[row.uid])) {
- if (!r.depth || r.depth <= depth)
- break;
- this.select_row(r.uid, CONTROL_KEY);
- }
- }
- row = row.nextSibling;
- }
- }
+ if (this.rows[uid].has_children && !this.rows[uid].expanded)
+ this.select_childs(uid);
}
// get subjects of selected messages
--
Gitblit v1.9.1