From 24201dc1f48770d20ffaa44fabe1ef571f979da9 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 18 Jun 2011 07:28:43 -0400
Subject: [PATCH] - Fix set_row_attribs() for backward compat.
---
program/js/list.js | 581 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 426 insertions(+), 155 deletions(-)
diff --git a/program/js/list.js b/program/js/list.js
index a39ba62..874f8f7 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)
@@ -33,6 +33,7 @@
this.rows = [];
this.selection = [];
this.rowcount = 0;
+ this.colcount = 0;
this.subject_col = -1;
this.shiftkey = false;
@@ -40,11 +41,14 @@
this.multiexpand = false;
this.multi_selecting = false;
this.draggable = false;
+ this.column_movable = false;
this.keyboard = false;
this.toggleselect = false;
this.dont_select = false;
this.drag_active = false;
+ this.col_drag_active = false;
+ this.column_fixed = null;
this.last_selected = 0;
this.shift_start = 0;
this.in_selection_before = false;
@@ -54,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];
};
@@ -72,18 +76,14 @@
this.rows = [];
this.rowcount = 0;
- var row;
- for(var r=0; r<this.list.tBodies[0].childNodes.length; r++) {
- row = this.list.tBodies[0].childNodes[r];
- while (row && row.nodeType != 1) {
- row = row.nextSibling;
- r++;
- }
+ var r, len, rows = this.list.tBodies[0].rows;
- this.init_row(row);
+ for (r=0, len=rows.length; r<len; r++) {
+ this.init_row(rows[r]);
this.rowcount++;
}
+ this.init_header();
this.frame = this.list.parentNode;
// set body events
@@ -101,15 +101,29 @@
init_row: function(row)
{
// 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;
+ if (row && String(row.id).match(/^rcmrow([a-z0-9\-_=\+\/]+)/i)) {
+ 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; };
@@ -120,11 +134,35 @@
/**
+ * Init list column headers and set mouse events on them
+ */
+init_header: function()
+{
+ if (this.list && this.list.tHead) {
+ this.colcount = 0;
+
+ var col, r, p = this;
+ // add events for list columns moving
+ if (this.column_movable && this.list.tHead && this.list.tHead.rows) {
+ for (r=0; r<this.list.tHead.rows[0].cells.length; r++) {
+ if (this.column_fixed == r)
+ continue;
+ col = this.list.tHead.rows[0].cells[r];
+ col.onmousedown = function(e){ return p.drag_column(e, this); };
+ this.colcount++;
+ }
+ }
+ }
+},
+
+
+/**
* Remove all list rows
*/
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 = [];
@@ -132,6 +170,10 @@
if (sel)
this.clear_selection();
+
+ // reset scroll position (in Opera)
+ if (this.frame)
+ this.frame.scrollTop = 0;
},
@@ -146,7 +188,7 @@
if (sel_next)
this.select_next();
- this.rows[uid] = null;
+ delete this.rows[uid];
this.rowcount--;
},
@@ -156,10 +198,7 @@
*/
insert_row: function(row, attop)
{
- if (this.background)
- var tbody = this.background;
- else
- var tbody = this.list.tBodies[0];
+ var tbody = this.list.tBodies[0];
if (attop && tbody.rows.length)
tbody.insertBefore(row, tbody.firstChild);
@@ -177,13 +216,19 @@
*/
focus: function(e)
{
+ var n, id;
this.focused = true;
- for (var n=0; n<this.selection.length; n++) {
+
+ 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);
@@ -195,9 +240,9 @@
*/
blur: function()
{
- var id;
+ var n, id;
this.focused = false;
- for (var n=0; n<this.selection.length; n++) {
+ 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');
@@ -207,13 +252,42 @@
/**
+ * onmousedown-handler of message list column
+ */
+drag_column: function(e, col)
+{
+ if (this.colcount > 1) {
+ this.drag_start = true;
+ this.drag_mouse_start = rcube_event.get_mouse_pos(e);
+
+ rcube_event.add_listener({event:'mousemove', object:this, method:'column_drag_mouse_move'});
+ rcube_event.add_listener({event:'mouseup', object:this, method:'column_drag_mouse_up'});
+
+ // enable dragging over iframes
+ this.add_dragfix();
+
+ // find selected column number
+ for (var i=0; i<this.list.tHead.rows[0].cells.length; i++) {
+ if (col == this.list.tHead.rows[0].cells[i]) {
+ this.selected_column = i;
+ break;
+ }
+ }
+ }
+
+ return false;
+},
+
+
+/**
* onmousedown-handler of message list row
*/
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;
@@ -234,17 +308,13 @@
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
- $('iframe').each(function() {
- $('<div class="iframe-dragdrop-fix"></div>')
- .css({background: '#fff',
- width: this.offsetWidth+'px', height: this.offsetHeight+'px',
- position: 'absolute', opacity: '0.001', zIndex: 1000
- })
- .css($(this).offset())
- .appendTo('body');
- });
+ this.add_dragfix();
}
return false;
@@ -256,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;
@@ -268,7 +338,7 @@
if (this.dont_select) {
this.dont_select = false;
return false;
- }
+ }
var dblclicked = now - this.rows[id].clicked < this.dblclick_time;
@@ -285,8 +355,11 @@
else
this.triggerEvent('click');
- if (!this.drag_active)
+ if (!this.drag_active) {
+ // remove temp divs
+ this.del_dragfix();
rcube_event.cancel(e);
+ }
this.rows[id].clicked = now;
return false;
@@ -309,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;
@@ -319,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
@@ -347,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;
}
@@ -359,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;
@@ -378,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 });
}
@@ -408,8 +482,7 @@
collapse_all: function(row)
{
- var depth, new_row;
- var r;
+ var depth, new_row, r;
if (row) {
row.expanded = false;
@@ -420,26 +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;
- this.update_expando(r.uid);
+ this.update_expando(r.uid, false);
this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded });
}
}
@@ -452,8 +523,7 @@
expand_all: function(row)
{
- var depth, new_row;
- var r;
+ var depth, new_row, r;
if (row) {
row.expanded = true;
@@ -463,20 +533,18 @@
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;
this.update_expando(r.uid, true);
this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded });
@@ -504,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;
@@ -517,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;
@@ -528,12 +598,11 @@
get_first_row: function()
{
if (this.rowcount) {
- var rows = this.list.tBodies[0].rows;
+ var i, len, rows = this.list.tBodies[0].rows;
- for(var i=0; i<rows.length-1; i++)
- if(rows[i].id && String(rows[i].id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
-
- return RegExp.$1;
+ for (i=0, len=rows.length-1; i<len; i++)
+ if (rows[i].id && String(rows[i].id).match(/^rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
+ return RegExp.$1;
}
return null;
@@ -542,12 +611,11 @@
get_last_row: function()
{
if (this.rowcount) {
- var rows = this.list.tBodies[0].rows;
+ var i, rows = this.list.tBodies[0].rows;
- for(var i=rows.length-1; i>=0; i--)
- if(rows[i].id && String(rows[i].id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
-
- return RegExp.$1;
+ for (i=rows.length-1; i>=0; i--)
+ if (rows[i].id && String(rows[i].id).match(/^rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
+ return RegExp.$1;
}
return null;
@@ -631,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);
},
@@ -645,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);
},
@@ -661,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);
},
@@ -679,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])) {
@@ -703,21 +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 to_rowIndex = this.rows[id].obj.rowIndex;
-
- var i = ((from_rowIndex < to_rowIndex)? from_rowIndex : to_rowIndex);
- var j = ((from_rowIndex > to_rowIndex)? from_rowIndex : to_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) {
- if ((this.rows[n].obj.rowIndex >= i) && (this.rows[n].obj.rowIndex <= j)) {
+ 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);
}
}
@@ -730,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;
@@ -747,15 +822,15 @@
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) {
- if (!filter || (this.rows[n] && this.rows[n][filter] == true)) {
+ for (n in this.rows) {
+ if (!filter || this.rows[n][filter] == true) {
this.last_selected = n;
this.highlight_row(n, true);
}
- else if (this.rows[n]) {
+ else {
$(this.rows[n].obj).removeClass('selected').removeClass('unfocused');
}
}
@@ -779,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
@@ -799,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; n<this.selection.length; n++)
+ for (n in this.selection)
if (this.selection[n] == id) {
this.selection.splice(n,1);
break;
@@ -811,7 +886,7 @@
}
// all rows
else {
- for (var n=0; n<this.selection.length; n++)
+ for (n in this.selection)
if (this.rows[this.selection[n]]) {
$(this.rows[this.selection[n]].obj).removeClass('selected').removeClass('unfocused');
}
@@ -863,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');
}
@@ -881,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:
@@ -912,6 +988,8 @@
this.shiftkey = e.shiftKey;
this.key_pressed = keyCode;
this.triggerEvent('keypress');
+ // reset shiftkey flag, we need it only for registered events
+ this.shiftkey = false;
if (this.key_pressed == this.BACKSPACE_KEY)
return rcube_event.cancel(e);
@@ -928,7 +1006,11 @@
switch (rcube_event.get_keycode(e)) {
case 27:
if (this.drag_active)
- return this.drag_mouse_up(e);
+ return this.drag_mouse_up(e);
+ if (this.col_drag_active) {
+ this.selected_column = null;
+ return this.column_drag_mouse_up(e);
+ }
case 40:
case 38:
@@ -992,9 +1074,7 @@
else
this.collapse(selected_row);
- var expando = document.getElementById('rcmexpando' + selected_row.uid);
- if (expando)
- expando.className = selected_row.expanded?'expanded':'collapsed';
+ this.update_expando(selected_row.uid, selected_row.expanded);
return false;
},
@@ -1029,6 +1109,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);
@@ -1037,24 +1125,27 @@
return false;
if (!this.draglayer)
- this.draglayer = $('<div>').attr('id', 'rcmdraglayer').css({ position:'absolute', display:'none', 'z-index':2000 }).appendTo(document.body);
+ this.draglayer = $('<div>').attr('id', 'rcmdraglayer')
+ .css({ position:'absolute', display:'none', 'z-index':2000 })
+ .appendTo(document.body);
// also select childs of (collapsed) threads for dragging
- var selection = $.merge([], this.selection);
- var depth, row, uid, r;
- for (var n=0; n < selection.length; n++) {
+ var n, uid, selection = $.merge([], this.selection);
+ for (n in selection) {
uid = selection[n];
if (this.rows[uid].has_children && !this.rows[uid].expanded)
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;
}
@@ -1067,7 +1158,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'))
@@ -1077,11 +1168,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++;
@@ -1090,9 +1184,7 @@
}
}
- this.draglayer.html(names);
this.draglayer.show();
-
this.drag_active = true;
this.triggerEvent('dragstart');
}
@@ -1115,6 +1207,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)
@@ -1129,9 +1226,14 @@
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
- $('div.iframe-dragdrop-fix').each(function() { this.parentNode.removeChild(this); });
+ this.del_dragfix();
this.triggerEvent('dragend');
@@ -1140,16 +1242,185 @@
/**
- * Creating the list in background
+ * Handler for mouse move events for dragging list column
*/
-set_background_mode: function(flag)
+column_drag_mouse_move: function(e)
{
- if (flag) {
- this.background = document.createElement('tbody');
- } else if (this.background) {
- this.list.replaceChild(this.background, this.list.tBodies[0]);
- this.background = null;
+ if (this.drag_start) {
+ // check mouse movement, of less than 3 pixels, don't start dragging
+ var i, m = rcube_event.get_mouse_pos(e);
+
+ if (!this.drag_mouse_start || (Math.abs(m.x - this.drag_mouse_start.x) < 3 && Math.abs(m.y - this.drag_mouse_start.y) < 3))
+ return false;
+
+ if (!this.col_draglayer) {
+ var lpos = $(this.list).offset(),
+ cells = this.list.tHead.rows[0].cells;
+
+ // create dragging layer
+ this.col_draglayer = $('<div>').attr('id', 'rcmcoldraglayer')
+ .css(lpos).css({ position:'absolute', 'z-index':2001,
+ 'background-color':'white', opacity:0.75,
+ height: (this.frame.offsetHeight-2)+'px', width: (this.frame.offsetWidth-2)+'px' })
+ .appendTo(document.body)
+ // ... and column position indicator
+ .append($('<div>').attr('id', 'rcmcolumnindicator')
+ .css({ position:'absolute', 'border-right':'2px dotted #555',
+ 'z-index':2002, height: (this.frame.offsetHeight-2)+'px' }));
+
+ this.cols = [];
+ this.list_pos = this.list_min_pos = lpos.left;
+ // save columns positions
+ for (i=0; i<cells.length; i++) {
+ this.cols[i] = cells[i].offsetWidth;
+ if (this.column_fixed !== null && i <= this.column_fixed) {
+ this.list_min_pos += this.cols[i];
+ }
+ }
+ }
+
+ this.col_draglayer.show();
+ this.col_drag_active = true;
+ this.triggerEvent('column_dragstart');
}
+
+ // set column indicator position
+ if (this.col_drag_active && this.col_draglayer) {
+ var i, cpos = 0, pos = rcube_event.get_mouse_pos(e);
+
+ for (i=0; i<this.cols.length; i++) {
+ if (pos.x >= this.cols[i]/2 + this.list_pos + cpos)
+ cpos += this.cols[i];
+ else
+ break;
+ }
+
+ // handle fixed columns on left
+ if (i == 0 && this.list_min_pos > pos.x)
+ cpos = this.list_min_pos - this.list_pos;
+ // empty list needs some assignment
+ else if (!this.list.rowcount && i == this.cols.length)
+ cpos -= 2;
+ $('#rcmcolumnindicator').css({ width: cpos+'px'});
+ this.triggerEvent('column_dragmove', e?e:window.event);
+ }
+
+ this.drag_start = false;
+
+ return false;
+},
+
+
+/**
+ * Handler for mouse up events for dragging list columns
+ */
+column_drag_mouse_up: function(e)
+{
+ document.onmousemove = null;
+
+ if (this.col_draglayer) {
+ (this.col_draglayer).remove();
+ this.col_draglayer = null;
+ }
+
+ if (this.col_drag_active)
+ this.focus();
+ this.col_drag_active = false;
+
+ rcube_event.remove_listener({event:'mousemove', object:this, method:'column_drag_mouse_move'});
+ rcube_event.remove_listener({event:'mouseup', object:this, method:'column_drag_mouse_up'});
+ // remove temp divs
+ this.del_dragfix();
+
+ if (this.selected_column !== null && this.cols && this.cols.length) {
+ var i, cpos = 0, pos = rcube_event.get_mouse_pos(e);
+
+ // find destination position
+ for (i=0; i<this.cols.length; i++) {
+ if (pos.x >= this.cols[i]/2 + this.list_pos + cpos)
+ cpos += this.cols[i];
+ else
+ break;
+ }
+
+ if (i != this.selected_column && i != this.selected_column+1) {
+ this.column_replace(this.selected_column, i);
+ }
+ }
+
+ this.triggerEvent('column_dragend');
+
+ return rcube_event.cancel(e);
+},
+
+
+/**
+ * Creates a layer for drag&drop over iframes
+ */
+add_dragfix: function()
+{
+ $('iframe').each(function() {
+ $('<div class="iframe-dragdrop-fix"></div>')
+ .css({background: '#fff',
+ width: this.offsetWidth+'px', height: this.offsetHeight+'px',
+ position: 'absolute', opacity: '0.001', zIndex: 1000
+ })
+ .css($(this).offset())
+ .appendTo(document.body);
+ });
+},
+
+
+/**
+ * Removes the layer for drag&drop over iframes
+ */
+del_dragfix: function()
+{
+ $('div.iframe-dragdrop-fix').each(function() { this.parentNode.removeChild(this); });
+},
+
+
+/**
+ * Replaces two columns
+ */
+column_replace: function(from, to)
+{
+ var len, cells = this.list.tHead.rows[0].cells,
+ elem = cells[from],
+ before = cells[to],
+ td = document.createElement('td');
+
+ // replace header cells
+ if (before)
+ cells[0].parentNode.insertBefore(td, before);
+ else
+ cells[0].parentNode.appendChild(td);
+ cells[0].parentNode.replaceChild(elem, td);
+
+ // replace list cells
+ for (r=0, len=this.list.tBodies[0].rows.length; r<len; r++) {
+ row = this.list.tBodies[0].rows[r];
+
+ elem = row.cells[from];
+ before = row.cells[to];
+ td = document.createElement('td');
+
+ if (before)
+ row.insertBefore(td, before);
+ else
+ row.appendChild(td);
+ row.replaceChild(elem, td);
+ }
+
+ // 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