From 569f8306db3f61831795f15793b1c8f749f94779 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 15 Apr 2011 11:26:16 -0400
Subject: [PATCH] Fix vcard folding at 75 chars; don't fold vcards for internal storage
---
program/js/list.js | 272 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 163 insertions(+), 109 deletions(-)
diff --git a/program/js/list.js b/program/js/list.js
index 42149d6..3f25d4d 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -1,9 +1,9 @@
/*
+-----------------------------------------------------------------------+
- | RoundCube List Widget |
+ | Roundcube List Widget |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2006-2009, RoundCube Dev, - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2006-2009, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
/**
- * RoundCube List Widget class
+ * Roundcube List Widget class
* @contructor
*/
function rcube_list_widget(list, p)
@@ -58,7 +58,7 @@
this.row_init = function(){};
// overwrite default paramaters
- if (p && typeof(p) == 'object')
+ if (p && typeof p === 'object')
for (var n in p)
this[n] = p[n];
};
@@ -102,14 +102,28 @@
{
// make references in internal array and set event handlers
if (row && String(row.id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i)) {
- var p = this;
- var uid = RegExp.$1;
+ var self = this,
+ uid = RegExp.$1;
row.uid = uid;
this.rows[uid] = {uid:uid, id:row.id, obj:row};
// set eventhandlers to table row
- row.onmousedown = function(e){ return p.drag_row(e, this.uid); };
- row.onmouseup = function(e){ return p.click_row(e, this.uid); };
+ row.onmousedown = function(e){ return self.drag_row(e, this.uid); };
+ row.onmouseup = function(e){ return self.click_row(e, this.uid); };
+
+ if (bw.iphone || bw.ipad) {
+ row.addEventListener('touchstart', function(e) {
+ if (e.touches.length == 1) {
+ if (!self.drag_row(rcube_event.touchevent(e.touches[0]), this.uid))
+ e.preventDefault();
+ }
+ }, false);
+ row.addEventListener('touchend', function(e) {
+ if (e.changedTouches.length == 1)
+ if (!self.click_row(rcube_event.touchevent(e.changedTouches[0]), this.uid))
+ e.preventDefault();
+ }, false);
+ }
if (document.all)
row.onselectstart = function() { return false; };
@@ -148,6 +162,7 @@
clear: function(sel)
{
var tbody = document.createElement('tbody');
+
this.list.insertBefore(tbody, this.list.tBodies[0]);
this.list.removeChild(this.list.tBodies[1]);
this.rows = [];
@@ -155,6 +170,10 @@
if (sel)
this.clear_selection();
+
+ // reset scroll position (in Opera)
+ if (this.frame)
+ this.frame.scrollTop = 0;
},
@@ -197,14 +216,19 @@
*/
focus: function(e)
{
- var id;
+ var n, id;
this.focused = true;
- for (var n in this.selection) {
+
+ for (n in this.selection) {
id = this.selection[n];
if (this.rows[id] && this.rows[id].obj) {
$(this.rows[id].obj).addClass('selected').removeClass('unfocused');
}
}
+
+ // Un-focus already focused elements
+ $('*:focus', window).blur();
+ $('iframe').each(function() { this.blur(); });
if (e || (e = window.event))
rcube_event.cancel(e);
@@ -216,9 +240,9 @@
*/
blur: function()
{
- var id;
+ var n, id;
this.focused = false;
- for (var n in this.selection) {
+ for (n in this.selection) {
id = this.selection[n];
if (this.rows[id] && this.rows[id].obj) {
$(this.rows[id].obj).removeClass('selected').addClass('unfocused');
@@ -261,8 +285,9 @@
drag_row: function(e, id)
{
// don't do anything (another action processed before)
- var evtarget = rcube_event.get_target(e);
- var tagname = evtarget.tagName.toLowerCase();
+ var evtarget = rcube_event.get_target(e),
+ tagname = evtarget.tagName.toLowerCase();
+
if (this.dont_select || (evtarget && (tagname == 'input' || tagname == 'img')))
return true;
@@ -283,6 +308,10 @@
this.drag_mouse_start = rcube_event.get_mouse_pos(e);
rcube_event.add_listener({event:'mousemove', object:this, method:'drag_mouse_move'});
rcube_event.add_listener({event:'mouseup', object:this, method:'drag_mouse_up'});
+ if (bw.iphone || bw.ipad) {
+ rcube_event.add_listener({event:'touchmove', object:this, method:'drag_mouse_move'});
+ rcube_event.add_listener({event:'touchend', object:this, method:'drag_mouse_up'});
+ }
// enable dragging over iframes
this.add_dragfix();
@@ -297,10 +326,10 @@
*/
click_row: function(e, id)
{
- var now = new Date().getTime();
- var mod_key = rcube_event.get_modifier(e);
- var evtarget = rcube_event.get_target(e);
- var tagname = evtarget.tagName.toLowerCase();
+ var now = new Date().getTime(),
+ mod_key = rcube_event.get_modifier(e),
+ evtarget = rcube_event.get_target(e),
+ tagname = evtarget.tagName.toLowerCase();
if ((evtarget && (tagname == 'input' || tagname == 'img')))
return true;
@@ -309,7 +338,7 @@
if (this.dont_select) {
this.dont_select = false;
return false;
- }
+ }
var dblclicked = now - this.rows[id].clicked < this.dblclick_time;
@@ -353,9 +382,9 @@
expand_row: function(e, id)
{
- var row = this.rows[id];
- var evtarget = rcube_event.get_target(e);
- var mod_key = rcube_event.get_modifier(e);
+ var row = this.rows[id],
+ evtarget = rcube_event.get_target(e),
+ mod_key = rcube_event.get_modifier(e);
// Don't select this message
this.dont_select = true;
@@ -363,14 +392,14 @@
row.clicked = 0;
if (row.expanded) {
- evtarget.className = "collapsed";
+ evtarget.className = 'collapsed';
if (mod_key == CONTROL_KEY || this.multiexpand)
this.collapse_all(row);
else
this.collapse(row);
}
else {
- evtarget.className = "expanded";
+ evtarget.className = 'expanded';
if (mod_key == CONTROL_KEY || this.multiexpand)
this.expand_all(row);
else
@@ -391,9 +420,11 @@
var r = this.rows[new_row.uid];
if (r && r.depth <= depth)
break;
- $(new_row).hide();
- r.expanded = false;
- this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded });
+ $(new_row).css('display', 'none');
+ if (r.expanded) {
+ r.expanded = false;
+ this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded });
+ }
}
new_row = new_row.nextSibling;
}
@@ -403,8 +434,7 @@
expand: function(row)
{
- var depth, new_row;
- var last_expanded_parent_depth;
+ var r, p, depth, new_row, last_expanded_parent_depth;
if (row) {
row.expanded = true;
@@ -422,17 +452,17 @@
while (new_row) {
if (new_row.nodeType == 1) {
- var r = this.rows[new_row.uid];
+ r = this.rows[new_row.uid];
if (r) {
if (row && (!r.depth || r.depth <= depth))
break;
if (r.parent_uid) {
- var p = this.rows[r.parent_uid];
+ p = this.rows[r.parent_uid];
if (p && p.expanded) {
if ((row && p == row) || last_expanded_parent_depth >= p.depth - 1) {
last_expanded_parent_depth = p.depth;
- $(new_row).show();
+ $(new_row).css('display', '');
r.expanded = true;
this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded });
}
@@ -452,8 +482,7 @@
collapse_all: function(row)
{
- var depth, new_row;
- var r;
+ var depth, new_row, r;
if (row) {
row.expanded = false;
@@ -464,27 +493,24 @@
// don't collapse sub-root tree in multiexpand mode
if (depth && this.multiexpand)
- return false;
+ return false;
}
else {
- var tbody = this.list.tBodies[0];
- new_row = tbody.firstChild;
+ new_row = this.list.tBodies[0].firstChild;
depth = 0;
}
while (new_row) {
if (new_row.nodeType == 1) {
- var r = this.rows[new_row.uid];
- if (r) {
+ if (r = this.rows[new_row.uid]) {
if (row && (!r.depth || r.depth <= depth))
break;
if (row || r.depth)
- $(new_row).hide();
- if (r.has_children) {
+ $(new_row).css('display', 'none');
+ if (r.has_children && r.expanded) {
r.expanded = false;
- if (!r.depth || !this.multiexpand)
- this.update_expando(r.uid, false);
+ this.update_expando(r.uid, false);
this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded });
}
}
@@ -497,8 +523,7 @@
expand_all: function(row)
{
- var depth, new_row;
- var r;
+ var depth, new_row, r;
if (row) {
row.expanded = true;
@@ -508,27 +533,20 @@
this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded });
}
else {
- var tbody = this.list.tBodies[0];
- new_row = tbody.firstChild;
+ new_row = this.list.tBodies[0].firstChild;
depth = 0;
}
while (new_row) {
if (new_row.nodeType == 1) {
- var r = this.rows[new_row.uid];
- if (r) {
+ if (r = this.rows[new_row.uid]) {
if (row && r.depth <= depth)
break;
- $(new_row).show();
- if (r.has_children) {
+ $(new_row).css('display', '');
+ if (r.has_children && !r.expanded) {
r.expanded = true;
- // in multiexpand mode only root has expando icon
- // so we don't need to set it for children, this
- // improves performance because getElementById()
- // is relatively slow on IE
- if (!r.depth || !this.multiexpand)
- this.update_expando(r.uid, true);
+ this.update_expando(r.uid, true);
this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded });
}
}
@@ -554,8 +572,9 @@
if (!this.rows)
return false;
- var last_selected_row = this.rows[this.last_selected];
- var new_row = last_selected_row ? last_selected_row.obj.nextSibling : null;
+ var last_selected_row = this.rows[this.last_selected],
+ new_row = last_selected_row ? last_selected_row.obj.nextSibling : null;
+
while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none'))
new_row = new_row.nextSibling;
@@ -567,8 +586,9 @@
if (!this.rows)
return false;
- var last_selected_row = this.rows[this.last_selected];
- var new_row = last_selected_row ? last_selected_row.obj.previousSibling : null;
+ var last_selected_row = this.rows[this.last_selected],
+ new_row = last_selected_row ? last_selected_row.obj.previousSibling : null;
+
while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none'))
new_row = new_row.previousSibling;
@@ -679,11 +699,12 @@
*/
select_next: function()
{
- var next_row = this.get_next_row();
- var prev_row = this.get_prev_row();
- var new_row = (next_row) ? next_row : prev_row;
+ var next_row = this.get_next_row(),
+ prev_row = this.get_prev_row(),
+ new_row = (next_row) ? next_row : prev_row;
+
if (new_row)
- this.select_row(new_row.uid, false, false);
+ this.select_row(new_row.uid, false, false);
},
@@ -693,13 +714,16 @@
select_first: function(mod_key)
{
var row = this.get_first_row();
- if (row && mod_key) {
- this.shift_select(row, mod_key);
- this.triggerEvent('select');
- this.scrollto(row);
+ if (row) {
+ if (mod_key) {
+ this.shift_select(row, mod_key);
+ this.triggerEvent('select');
+ this.scrollto(row);
+ }
+ else {
+ this.select(row);
+ }
}
- else if (row)
- this.select(row);
},
@@ -709,13 +733,16 @@
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);
+ if (row) {
+ if (mod_key) {
+ this.shift_select(row, mod_key);
+ this.triggerEvent('select');
+ this.scrollto(row);
+ }
+ else {
+ this.select(row);
+ }
}
- else if (row)
- this.select(row);
},
@@ -727,8 +754,9 @@
if (!this.rows[uid] || !this.rows[uid].has_children)
return;
- var depth = this.rows[uid].depth;
- var row = this.rows[uid].obj.nextSibling;
+ var depth = this.rows[uid].depth,
+ row = this.rows[uid].obj.nextSibling;
+
while (row) {
if (row.nodeType == 1) {
if ((r = this.rows[row.uid])) {
@@ -751,20 +779,20 @@
if (!this.rows[this.shift_start] || !this.selection.length)
this.shift_start = id;
- var from_rowIndex = this.rows[this.shift_start].obj.rowIndex,
+ var n, from_rowIndex = this.rows[this.shift_start].obj.rowIndex,
to_rowIndex = this.rows[id].obj.rowIndex,
i = ((from_rowIndex < to_rowIndex)? from_rowIndex : to_rowIndex),
j = ((from_rowIndex > to_rowIndex)? from_rowIndex : to_rowIndex);
// iterate through the entire message list
- for (var n in this.rows) {
+ for (n in this.rows) {
if (this.rows[n].obj.rowIndex >= i && this.rows[n].obj.rowIndex <= j) {
if (!this.in_selection(n)) {
this.highlight_row(n, true);
}
}
else {
- if (this.in_selection(n) && !control) {
+ if (this.in_selection(n) && !control) {
this.highlight_row(n, true);
}
}
@@ -777,7 +805,7 @@
*/
in_selection: function(id)
{
- for(var n in this.selection)
+ for (var n in this.selection)
if (this.selection[n]==id)
return true;
@@ -794,10 +822,10 @@
return false;
// reset but remember selection first
- var select_before = this.selection.join(',');
+ var n, select_before = this.selection.join(',');
this.selection = [];
- for (var n in this.rows) {
+ for (n in this.rows) {
if (!filter || this.rows[n][filter] == true) {
this.last_selected = n;
this.highlight_row(n, true);
@@ -826,9 +854,9 @@
return false;
// remember old selection
- var select_before = this.selection.join(',');
+ var n, select_before = this.selection.join(',');
- for (var n in this.rows)
+ for (n in this.rows)
this.highlight_row(n, true);
// trigger event if selection changed
@@ -846,11 +874,11 @@
*/
clear_selection: function(id)
{
- var num_select = this.selection.length;
+ var n, num_select = this.selection.length;
// one row
if (id) {
- for (var n=0 in this.selection)
+ for (n in this.selection)
if (this.selection[n] == id) {
this.selection.splice(n,1);
break;
@@ -858,7 +886,7 @@
}
// all rows
else {
- for (var n in this.selection)
+ for (n in this.selection)
if (this.rows[this.selection[n]]) {
$(this.rows[this.selection[n]].obj).removeClass('selected').removeClass('unfocused');
}
@@ -910,9 +938,10 @@
$(this.rows[id].obj).addClass('selected');
}
else { // unselect row
- var p = $.inArray(id, this.selection);
- var a_pre = this.selection.slice(0, p);
- var a_post = this.selection.slice(p+1, this.selection.length);
+ var p = $.inArray(id, this.selection),
+ a_pre = this.selection.slice(0, p),
+ a_post = this.selection.slice(p+1, this.selection.length);
+
this.selection = a_pre.concat(a_post);
$(this.rows[id].obj).removeClass('selected').removeClass('unfocused');
}
@@ -928,8 +957,8 @@
if (this.focused != true)
return true;
- var keyCode = rcube_event.get_keycode(e);
- var mod_key = rcube_event.get_modifier(e);
+ var keyCode = rcube_event.get_keycode(e),
+ mod_key = rcube_event.get_modifier(e);
switch (keyCode) {
case 40:
@@ -1078,6 +1107,14 @@
*/
drag_mouse_move: function(e)
{
+ // convert touch event
+ if (e.type == 'touchmove') {
+ if (e.changedTouches.length == 1)
+ e = rcube_event.touchevent(e.changedTouches[0]);
+ else
+ return rcube_event.cancel(e);
+ }
+
if (this.drag_start) {
// check mouse movement, of less than 3 pixels, don't start dragging
var m = rcube_event.get_mouse_pos(e);
@@ -1098,13 +1135,15 @@
this.select_childs(uid);
}
+ // reset content
+ this.draglayer.html('');
+
// get subjects of selected messages
- var names = '';
- var c, i, subject, obj;
- for (var n=0; n<this.selection.length; n++) {
+ var c, i, n, subject, obj;
+ for (n=0; n<this.selection.length; n++) {
// only show 12 lines
if (n>12) {
- names += '...';
+ this.draglayer.append('...');
break;
}
@@ -1117,7 +1156,7 @@
this.drag_start_pos = $(obj.childNodes[i]).offset();
if (this.subject_col < 0 || (this.subject_col >= 0 && this.subject_col == c)) {
- var node, tmp_node, nodes = obj.childNodes[i].childNodes;
+ var entry, node, tmp_node, nodes = obj.childNodes[i].childNodes;
// find text node
for (m=0; m<nodes.length; m++) {
if ((tmp_node = obj.childNodes[i].childNodes[m]) && (tmp_node.nodeType==3 || tmp_node.nodeName=='A'))
@@ -1127,11 +1166,14 @@
if (!node)
break;
- subject = node.nodeType==3 ? node.data : node.innerHTML;
+ subject = $(node).text();
// remove leading spaces
- subject = subject.replace(/^\s+/i, '');
+ subject = $.trim(subject);
// truncate line to 50 characters
- names += (subject.length > 50 ? subject.substring(0, 50)+'...' : subject) + '<br />';
+ subject = (subject.length > 50 ? subject.substring(0, 50) + '...' : subject);
+
+ entry = $('<div>').text(subject);
+ this.draglayer.append(entry);
break;
}
c++;
@@ -1140,9 +1182,7 @@
}
}
- this.draglayer.html(names);
this.draglayer.show();
-
this.drag_active = true;
this.triggerEvent('dragstart');
}
@@ -1165,6 +1205,11 @@
drag_mouse_up: function(e)
{
document.onmousemove = null;
+
+ if (e.type == 'touchend') {
+ if (e.changedTouches.length != 1)
+ return rcube_event.cancel(e);
+ }
if (this.draglayer && this.draglayer.is(':visible')) {
if (this.drag_start_pos)
@@ -1179,6 +1224,11 @@
rcube_event.remove_listener({event:'mousemove', object:this, method:'drag_mouse_move'});
rcube_event.remove_listener({event:'mouseup', object:this, method:'drag_mouse_up'});
+
+ if (bw.iphone || bw.ipad) {
+ rcube_event.remove_listener({event:'touchmove', object:this, method:'drag_mouse_move'});
+ rcube_event.remove_listener({event:'touchend', object:this, method:'drag_mouse_up'});
+ }
// remove temp divs
this.del_dragfix();
@@ -1315,7 +1365,7 @@
})
.css($(this).offset())
.appendTo(document.body);
- });
+ });
},
@@ -1333,7 +1383,7 @@
*/
column_replace: function(from, to)
{
- var cells = this.list.tHead.rows[0].cells,
+ var len, cells = this.list.tHead.rows[0].cells,
elem = cells[from],
before = cells[to],
td = document.createElement('td');
@@ -1346,7 +1396,7 @@
cells[0].parentNode.replaceChild(elem, td);
// replace list cells
- for (r=0; r<this.list.tBodies[0].rows.length; r++) {
+ for (r=0, len=this.list.tBodies[0].rows.length; r<len; r++) {
row = this.list.tBodies[0].rows[r];
elem = row.cells[from];
@@ -1363,6 +1413,10 @@
// update subject column position
if (this.subject_col == from)
this.subject_col = to > from ? to - 1 : to;
+ else if (this.subject_col < from && to <= this.subject_col)
+ this.subject_col++;
+ else if (this.subject_col > from && to >= this.subject_col)
+ this.subject_col--;
this.triggerEvent('column_replace');
}
--
Gitblit v1.9.1