From a2e81736a91f72c8688e6ab0f45061369614dae3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 19 Jun 2010 13:46:11 -0400
Subject: [PATCH] - Move quota indicator to mailboxlist footer - Fix groupcontrols on IE6 (use gif)
---
program/js/list.js | 130 +++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 48 deletions(-)
diff --git a/program/js/list.js b/program/js/list.js
index 8cfd05e..3309586 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -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 self = this;
var 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 = [];
@@ -261,8 +276,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 +299,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 +317,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 +329,7 @@
if (this.dont_select) {
this.dont_select = false;
return false;
- }
+ }
var dblclicked = now - this.rows[id].clicked < this.dblclick_time;
@@ -353,9 +373,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 +383,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 +411,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;
}
@@ -432,7 +454,7 @@
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 +474,7 @@
collapse_all: function(row)
{
- var depth, new_row;
- var r;
+ var depth, new_row, r;
if (row) {
row.expanded = false;
@@ -464,27 +485,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 +515,7 @@
expand_all: function(row)
{
- var depth, new_row;
- var r;
+ var depth, new_row, r;
if (row) {
row.expanded = true;
@@ -508,27 +525,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 +564,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 +578,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;
@@ -1078,6 +1090,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);
@@ -1165,6 +1185,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 +1204,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();
@@ -1363,6 +1393,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