- code formatting, cleanup and small improvements

release-0.6
alecpl 15 years ago
parent 186537b2c6
commit 8fa9229d57

File diff suppressed because it is too large Load Diff

@ -24,7 +24,7 @@ var CONTROL_SHIFT_KEY = 3;
* @constructor * @constructor
*/ */
function roundcube_browser() function roundcube_browser()
{ {
this.ver = parseFloat(navigator.appVersion); this.ver = parseFloat(navigator.appVersion);
this.appver = navigator.appVersion; this.appver = navigator.appVersion;
this.agent = navigator.userAgent; this.agent = navigator.userAgent;
@ -72,7 +72,6 @@ function roundcube_browser()
else if(this.konq && window.RegExp) else if(this.konq && window.RegExp)
this.vendver = (/khtml\/([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0; this.vendver = (/khtml\/([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
// get real language out of safari's user agent // get real language out of safari's user agent
if(this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/i.test(this.agent))) if(this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/i.test(this.agent)))
this.lang = RegExp.$1; this.lang = RegExp.$1;
@ -85,13 +84,12 @@ function roundcube_browser()
this.cookies = navigator.cookieEnabled; this.cookies = navigator.cookieEnabled;
// test for XMLHTTP support // test for XMLHTTP support
this.xmlhttp_test = function() this.xmlhttp_test = function() {
{
var activeX_test = new Function("try{var o=new ActiveXObject('Microsoft.XMLHTTP');return true;}catch(err){return false;}"); var activeX_test = new Function("try{var o=new ActiveXObject('Microsoft.XMLHTTP');return true;}catch(err){return false;}");
this.xmlhttp = (window.XMLHttpRequest || (window.ActiveXObject && activeX_test())) ? true : false; this.xmlhttp = (window.XMLHttpRequest || (window.ActiveXObject && activeX_test())) ? true : false;
return this.xmlhttp; return this.xmlhttp;
}
} }
};
// static functions for DOM event handling // static functions for DOM event handling
@ -132,16 +130,14 @@ get_modifier: function(e)
var opcode = 0; var opcode = 0;
e = e || window.event; e = e || window.event;
if (bw.mac && e) if (bw.mac && e) {
{
opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY); opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
return opcode; return opcode;
} }
if (e) if (e) {
{
opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY); opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
return opcode; return opcode;
} }
}, },
/** /**
@ -153,8 +149,7 @@ get_mouse_pos: function(e)
var mX = (e.pageX) ? e.pageX : e.clientX; var mX = (e.pageX) ? e.pageX : e.clientX;
var mY = (e.pageY) ? e.pageY : e.clientY; var mY = (e.pageY) ? e.pageY : e.clientY;
if (document.body && document.all) if (document.body && document.all) {
{
mX += document.body.scrollLeft; mX += document.body.scrollLeft;
mY += document.body.scrollTop; mY += document.body.scrollTop;
} }
@ -186,13 +181,12 @@ add_listener: function(p)
if (p.element.addEventListener) if (p.element.addEventListener)
p.element.addEventListener(p.event, p.object._rc_events[key], false); p.element.addEventListener(p.event, p.object._rc_events[key], false);
else if (p.element.attachEvent) else if (p.element.attachEvent) {
{
// IE allows multiple events with the same function to be applied to the same object // IE allows multiple events with the same function to be applied to the same object
// forcibly detach the event, then attach // forcibly detach the event, then attach
p.element.detachEvent('on'+p.event, p.object._rc_events[key]); p.element.detachEvent('on'+p.event, p.object._rc_events[key]);
p.element.attachEvent('on'+p.event, p.object._rc_events[key]); p.element.attachEvent('on'+p.event, p.object._rc_events[key]);
} }
else else
p.element['on'+p.event] = p.object._rc_events[key]; p.element['on'+p.event] = p.object._rc_events[key];
}, },
@ -241,7 +235,7 @@ cancel: function(evt)
function rcube_event_engine() function rcube_event_engine()
{ {
this._events = {}; this._events = {};
} };
rcube_event_engine.prototype = { rcube_event_engine.prototype = {
@ -313,7 +307,7 @@ triggerEvent: function(evt, e)
return ret; return ret;
} }
} // end rcube_event_engine.prototype }; // end rcube_event_engine.prototype
@ -328,7 +322,7 @@ function rcube_layer(id, attributes)
// create a new layer in the current document // create a new layer in the current document
this.create = function(arg) this.create = function(arg)
{ {
var l = (arg.x) ? arg.x : 0; var l = (arg.x) ? arg.x : 0;
var t = (arg.y) ? arg.y : 0; var t = (arg.y) ? arg.y : 0;
var w = arg.width; var w = arg.width;
@ -340,22 +334,20 @@ function rcube_layer(id, attributes)
obj = document.createElement('DIV'); obj = document.createElement('DIV');
with(obj) with(obj) {
{
id = this.name; id = this.name;
with(style) with(style) {
{ position = 'absolute';
position = 'absolute';
visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden'; visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden';
left = l+'px'; left = l+'px';
top = t+'px'; top = t+'px';
if (w) if (w)
width = w.toString().match(/\%$/) ? w : w+'px'; width = w.toString().match(/\%$/) ? w : w+'px';
if (h) if (h)
height = h.toString().match(/\%$/) ? h : h+'px'; height = h.toString().match(/\%$/) ? h : h+'px';
if(z) zIndex = z; if(z) zIndex = z;
} }
} }
if (parent) if (parent)
parent.appendChild(obj); parent.appendChild(obj);
@ -363,19 +355,16 @@ function rcube_layer(id, attributes)
document.body.appendChild(obj); document.body.appendChild(obj);
this.elm = obj; this.elm = obj;
}; };
// create new layer // create new layer
if(attributes!=null) if(attributes != null) {
{
this.create(attributes); this.create(attributes);
this.name = this.elm.id; this.name = this.elm.id;
} }
else // just refer to the object else // just refer to the object
this.elm = document.getElementById(id); this.elm = document.getElementById(id);
if(!this.elm) if(!this.elm)
return false; return false;
@ -393,63 +382,56 @@ function rcube_layer(id, attributes)
// ********* layer object methods ********* // ********* layer object methods *********
// move the layer to a specific position // move the layer to a specific position
this.move = function(x, y) this.move = function(x, y)
{ {
this.x = x; this.x = x;
this.y = y; this.y = y;
this.css.left = Math.round(this.x)+'px'; this.css.left = Math.round(this.x)+'px';
this.css.top = Math.round(this.y)+'px'; this.css.top = Math.round(this.y)+'px';
} };
// change the layers width and height // change the layers width and height
this.resize = function(w,h) this.resize = function(w,h)
{ {
this.css.width = w+'px'; this.css.width = w+'px';
this.css.height = h+'px'; this.css.height = h+'px';
this.width = w; this.width = w;
this.height = h; this.height = h;
} };
// show or hide the layer // show or hide the layer
this.show = function(a) this.show = function(a)
{ {
if(a==1) if(a == 1) {
{
this.css.visibility = 'visible'; this.css.visibility = 'visible';
this.visible = true; this.visible = true;
} }
else if(a==2) else if(a == 2) {
{
this.css.visibility = 'inherit'; this.css.visibility = 'inherit';
this.visible = true; this.visible = true;
} }
else else {
{
this.css.visibility = 'hidden'; this.css.visibility = 'hidden';
this.visible = false; this.visible = false;
}
} }
};
// write new content into a Layer // write new content into a Layer
this.write = function(cont) this.write = function(cont)
{ {
this.elm.innerHTML = cont; this.elm.innerHTML = cont;
} };
} };
// check if input is a valid email address // check if input is a valid email address
// By Cal Henderson <cal@iamcal.com> // By Cal Henderson <cal@iamcal.com>
// http://code.iamcal.com/php/rfc822/ // http://code.iamcal.com/php/rfc822/
function rcube_check_email(input, inline) function rcube_check_email(input, inline)
{ {
if (input && window.RegExp) if (input && window.RegExp) {
{
var qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]'; var qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]';
var dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]'; var dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]';
var atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+'; var atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+';
@ -464,10 +446,10 @@ function rcube_check_email(input, inline)
var delim = '[,;\s\n]'; var delim = '[,;\s\n]';
var reg1 = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i'); var reg1 = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i');
return reg1.test(input) ? true : false; return reg1.test(input) ? true : false;
}
return false;
} }
return false;
};
// recursively copy an object // recursively copy an object
function rcube_clone_object(obj) function rcube_clone_object(obj)
@ -482,13 +464,13 @@ function rcube_clone_object(obj)
} }
return out; return out;
} };
// make a string URL safe // make a string URL safe
function urlencode(str) function urlencode(str)
{ {
return window.encodeURIComponent ? encodeURIComponent(str) : escape(str); return window.encodeURIComponent ? encodeURIComponent(str) : escape(str);
} };
// get any type of html objects by id/name // get any type of html objects by id/name
@ -523,7 +505,7 @@ function rcube_find_object(id, d)
} }
return obj; return obj;
} };
// determine whether the mouse is over the given object or not // determine whether the mouse is over the given object or not
function rcube_mouse_is_over(ev, obj) function rcube_mouse_is_over(ev, obj)
@ -533,40 +515,38 @@ function rcube_mouse_is_over(ev, obj)
return ((mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) && return ((mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) &&
(mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight))); (mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight)));
} };
// cookie functions by GoogieSpell // cookie functions by GoogieSpell
function setCookie(name, value, expires, path, domain, secure) function setCookie(name, value, expires, path, domain, secure)
{ {
var curCookie = name + "=" + escape(value) + var curCookie = name + "=" + escape(value) +
(expires ? "; expires=" + expires.toGMTString() : "") + (expires ? "; expires=" + expires.toGMTString() : "") +
(path ? "; path=" + path : "") + (path ? "; path=" + path : "") +
(domain ? "; domain=" + domain : "") + (domain ? "; domain=" + domain : "") +
(secure ? "; secure" : ""); (secure ? "; secure" : "");
document.cookie = curCookie; document.cookie = curCookie;
} };
roundcube_browser.prototype.set_cookie = setCookie;
function getCookie(name) function getCookie(name)
{ {
var dc = document.cookie; var dc = document.cookie;
var prefix = name + "="; var prefix = name + "=";
var begin = dc.indexOf("; " + prefix); var begin = dc.indexOf("; " + prefix);
if (begin == -1) if (begin == -1) {
{
begin = dc.indexOf(prefix); begin = dc.indexOf(prefix);
if (begin != 0) return null; if (begin != 0) return null;
} }
else else
begin += 2; begin += 2;
var end = document.cookie.indexOf(";", begin); var end = document.cookie.indexOf(";", begin);
if (end == -1) if (end == -1)
end = dc.length; end = dc.length;
return unescape(dc.substring(begin + prefix.length, end)); return unescape(dc.substring(begin + prefix.length, end));
} };
roundcube_browser.prototype.set_cookie = setCookie;
roundcube_browser.prototype.get_cookie = getCookie; roundcube_browser.prototype.get_cookie = getCookie;
// tiny replacement for Firebox functionality // tiny replacement for Firebox functionality
@ -597,7 +577,7 @@ function rcube_console()
if (box) if (box)
box.innerText = box.value = ''; box.innerText = box.value = '';
}; };
} };
var bw = new roundcube_browser(); var bw = new roundcube_browser();
if (!window.console) if (!window.console)
@ -607,17 +587,17 @@ if (!window.console)
// Add escape() method to RegExp object // Add escape() method to RegExp object
// http://dev.rubyonrails.org/changeset/7271 // http://dev.rubyonrails.org/changeset/7271
RegExp.escape = function(str) RegExp.escape = function(str)
{ {
return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1'); return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
} };
// Make getElementById() case-sensitive on IE // Make getElementById() case-sensitive on IE
if (bw.ie) if (bw.ie)
{ {
document._getElementById = document.getElementById; document._getElementById = document.getElementById;
document.getElementById = function(id) document.getElementById = function(id)
{ {
var i = 0; var i = 0;
var o = document._getElementById(id); var o = document._getElementById(id);
@ -626,5 +606,5 @@ if (bw.ie)
i++; i++;
return o; return o;
}
} }
};

@ -22,18 +22,18 @@
* @contructor * @contructor
*/ */
function rcube_list_widget(list, p) function rcube_list_widget(list, p)
{ {
// static contants // static contants
this.ENTER_KEY = 13; this.ENTER_KEY = 13;
this.DELETE_KEY = 46; this.DELETE_KEY = 46;
this.BACKSPACE_KEY = 8; this.BACKSPACE_KEY = 8;
this.list = list ? list : null; this.list = list ? list : null;
this.frame = null; this.frame = null;
this.rows = []; this.rows = [];
this.selection = []; this.selection = [];
this.rowcount = 0; this.rowcount = 0;
this.subject_col = -1; this.subject_col = -1;
this.shiftkey = false; this.shiftkey = false;
this.multiselect = false; this.multiselect = false;
@ -42,7 +42,7 @@ function rcube_list_widget(list, p)
this.draggable = false; this.draggable = false;
this.keyboard = false; this.keyboard = false;
this.toggleselect = false; this.toggleselect = false;
this.dont_select = false; this.dont_select = false;
this.drag_active = false; this.drag_active = false;
this.last_selected = 0; this.last_selected = 0;
@ -52,12 +52,12 @@ function rcube_list_widget(list, p)
this.drag_mouse_start = null; this.drag_mouse_start = null;
this.dblclick_time = 600; this.dblclick_time = 600;
this.row_init = function(){}; this.row_init = function(){};
// overwrite default paramaters // overwrite default paramaters
if (p && typeof(p)=='object') if (p && typeof(p) == 'object')
for (var n in p) for (var n in p)
this[n] = p[n]; this[n] = p[n];
} };
rcube_list_widget.prototype = { rcube_list_widget.prototype = {
@ -68,17 +68,14 @@ rcube_list_widget.prototype = {
*/ */
init: function() init: function()
{ {
if (this.list && this.list.tBodies[0]) if (this.list && this.list.tBodies[0]) {
{ this.rows = [];
this.rows = new Array();
this.rowcount = 0; this.rowcount = 0;
var row; var row;
for(var r=0; r<this.list.tBodies[0].childNodes.length; r++) for(var r=0; r<this.list.tBodies[0].childNodes.length; r++) {
{
row = this.list.tBodies[0].childNodes[r]; row = this.list.tBodies[0].childNodes[r];
while (row && row.nodeType != 1) while (row && row.nodeType != 1) {
{
row = row.nextSibling; row = row.nextSibling;
r++; r++;
} }
@ -104,8 +101,7 @@ init: function()
init_row: function(row) init_row: function(row)
{ {
// make references in internal array and set event handlers // make references in internal array and set event handlers
if (row && String(row.id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i)) if (row && String(row.id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i)) {
{
var p = this; var p = this;
var uid = RegExp.$1; var uid = RegExp.$1;
row.uid = uid; row.uid = uid;
@ -131,10 +127,11 @@ clear: function(sel)
var tbody = document.createElement('tbody'); var tbody = document.createElement('tbody');
this.list.insertBefore(tbody, this.list.tBodies[0]); this.list.insertBefore(tbody, this.list.tBodies[0]);
this.list.removeChild(this.list.tBodies[1]); this.list.removeChild(this.list.tBodies[1]);
this.rows = new Array(); this.rows = [];
this.rowcount = 0; this.rowcount = 0;
if (sel) this.clear_selection(); if (sel)
this.clear_selection();
}, },
@ -181,8 +178,7 @@ insert_row: function(row, attop)
focus: function(e) focus: function(e)
{ {
this.focused = true; this.focused = true;
for (var n=0; n<this.selection.length; n++) for (var n=0; n<this.selection.length; n++) {
{
id = this.selection[n]; id = this.selection[n];
if (this.rows[id] && this.rows[id].obj) { if (this.rows[id] && this.rows[id].obj) {
$(this.rows[id].obj).addClass('selected').removeClass('unfocused'); $(this.rows[id].obj).addClass('selected').removeClass('unfocused');
@ -201,8 +197,7 @@ blur: function()
{ {
var id; var id;
this.focused = false; this.focused = false;
for (var n=0; n<this.selection.length; n++) for (var n=0; n<this.selection.length; n++) {
{
id = this.selection[n]; id = this.selection[n];
if (this.rows[id] && this.rows[id].obj) { if (this.rows[id] && this.rows[id].obj) {
$(this.rows[id].obj).removeClass('selected').addClass('unfocused'); $(this.rows[id].obj).removeClass('selected').addClass('unfocused');
@ -221,22 +216,20 @@ drag_row: function(e, id)
var tagname = evtarget.tagName.toLowerCase(); var tagname = evtarget.tagName.toLowerCase();
if (this.dont_select || (evtarget && (tagname == 'input' || tagname == 'img'))) if (this.dont_select || (evtarget && (tagname == 'input' || tagname == 'img')))
return true; return true;
// accept right-clicks // accept right-clicks
if (rcube_event.get_button(e) == 2) if (rcube_event.get_button(e) == 2)
return true; return true;
this.in_selection_before = this.in_selection(id) ? id : false; this.in_selection_before = this.in_selection(id) ? id : false;
// selects currently unselected row // selects currently unselected row
if (!this.in_selection_before) if (!this.in_selection_before) {
{
var mod_key = rcube_event.get_modifier(e); var mod_key = rcube_event.get_modifier(e);
this.select_row(id, mod_key, false); this.select_row(id, mod_key, false);
} }
if (this.draggable && this.selection.length) if (this.draggable && this.selection.length) {
{
this.drag_start = true; this.drag_start = true;
this.drag_mouse_start = rcube_event.get_mouse_pos(e); 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:'mousemove', object:this, method:'drag_mouse_move'});
@ -272,12 +265,11 @@ click_row: function(e, id)
return true; return true;
// don't do anything (another action processed before) // don't do anything (another action processed before)
if (this.dont_select) if (this.dont_select) {
{
this.dont_select = false; this.dont_select = false;
return false; return false;
} }
var dblclicked = now - this.rows[id].clicked < this.dblclick_time; var dblclicked = now - this.rows[id].clicked < this.dblclick_time;
// unselects currently selected row // unselects currently selected row
@ -425,7 +417,7 @@ collapse_all: function(row)
new_row = row.obj.nextSibling; new_row = row.obj.nextSibling;
this.update_expando(row.uid); this.update_expando(row.uid);
this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded }); this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded });
// don't collapse sub-root tree in multiexpand mode // don't collapse sub-root tree in multiexpand mode
if (depth && this.multiexpand) if (depth && this.multiexpand)
return false; return false;
@ -535,28 +527,28 @@ get_prev_row: function()
get_first_row: function() get_first_row: function()
{ {
if (this.rowcount) if (this.rowcount) {
{
var rows = this.list.tBodies[0].rows; var rows = this.list.tBodies[0].rows;
for(var i=0; i<rows.length-1; i++) 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) if(rows[i].id && String(rows[i].id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
return RegExp.$1; return RegExp.$1;
} }
return null; return null;
}, },
get_last_row: function() get_last_row: function()
{ {
if (this.rowcount) if (this.rowcount) {
{
var rows = this.list.tBodies[0].rows; var rows = this.list.tBodies[0].rows;
for(var i=rows.length-1; i>=0; i--) 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) if(rows[i].id && String(rows[i].id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
return RegExp.$1; return RegExp.$1;
} }
return null; return null;
}, },
@ -570,20 +562,17 @@ select_row: function(id, mod_key, with_mouse)
var select_before = this.selection.join(','); var select_before = this.selection.join(',');
if (!this.multiselect) if (!this.multiselect)
mod_key = 0; mod_key = 0;
if (!this.shift_start) if (!this.shift_start)
this.shift_start = id this.shift_start = id
if (!mod_key) if (!mod_key) {
{
this.shift_start = id; this.shift_start = id;
this.highlight_row(id, false); this.highlight_row(id, false);
this.multi_selecting = false; this.multi_selecting = false;
} }
else else {
{ switch (mod_key) {
switch (mod_key)
{
case SHIFT_KEY: case SHIFT_KEY:
this.shift_select(id, false); this.shift_select(id, false);
break; break;
@ -612,8 +601,7 @@ select_row: function(id, mod_key, with_mouse)
$(this.rows[this.last_selected].obj).removeClass('focused'); $(this.rows[this.last_selected].obj).removeClass('focused');
// unselect if toggleselect is active and the same row was clicked again // unselect if toggleselect is active and the same row was clicked again
if (this.toggleselect && this.last_selected == id) if (this.toggleselect && this.last_selected == id) {
{
this.clear_selection(); this.clear_selection();
id = null; id = null;
} }
@ -690,7 +678,7 @@ select_childs: function(uid)
{ {
if (!this.rows[uid] || !this.rows[uid].has_children) if (!this.rows[uid] || !this.rows[uid].has_children)
return; return;
var depth = this.rows[uid].depth; var depth = this.rows[uid].depth;
var row = this.rows[uid].obj.nextSibling; var row = this.rows[uid].obj.nextSibling;
while (row) { while (row) {
@ -722,16 +710,13 @@ shift_select: function(id, control)
var j = ((from_rowIndex > to_rowIndex)? from_rowIndex : to_rowIndex); var j = ((from_rowIndex > to_rowIndex)? from_rowIndex : to_rowIndex);
// iterate through the entire message list // iterate through the entire message list
for (var n in this.rows) for (var n in this.rows) {
{ if ((this.rows[n].obj.rowIndex >= i) && (this.rows[n].obj.rowIndex <= j)) {
if ((this.rows[n].obj.rowIndex >= i) && (this.rows[n].obj.rowIndex <= j))
{
if (!this.in_selection(n)) { if (!this.in_selection(n)) {
this.highlight_row(n, true); this.highlight_row(n, true);
} }
} }
else else {
{
if (this.in_selection(n) && !control) { if (this.in_selection(n) && !control) {
this.highlight_row(n, true); this.highlight_row(n, true);
} }
@ -763,17 +748,14 @@ select_all: function(filter)
// reset but remember selection first // reset but remember selection first
var select_before = this.selection.join(','); var select_before = this.selection.join(',');
this.selection = new Array(); this.selection = [];
for (var n in this.rows) for (var n in this.rows) {
{ if (!filter || (this.rows[n] && this.rows[n][filter] == true)) {
if (!filter || (this.rows[n] && this.rows[n][filter] == true))
{
this.last_selected = n; this.last_selected = n;
this.highlight_row(n, true); this.highlight_row(n, true);
} }
else if (this.rows[n]) else if (this.rows[n]) {
{
$(this.rows[n].obj).removeClass('selected').removeClass('unfocused'); $(this.rows[n].obj).removeClass('selected').removeClass('unfocused');
} }
} }
@ -798,7 +780,7 @@ invert_selection: function()
// remember old selection // remember old selection
var select_before = this.selection.join(','); var select_before = this.selection.join(',');
for (var n in this.rows) for (var n in this.rows)
this.highlight_row(n, true); this.highlight_row(n, true);
@ -820,24 +802,22 @@ clear_selection: function(id)
var num_select = this.selection.length; var num_select = this.selection.length;
// one row // one row
if (id) if (id) {
{
for (var n=0; n<this.selection.length; n++) for (var n=0; n<this.selection.length; n++)
if (this.selection[n] == id) { if (this.selection[n] == id) {
this.selection.splice(n,1); this.selection.splice(n,1);
break; break;
} }
} }
// all rows // all rows
else else {
{
for (var n=0; n<this.selection.length; n++) for (var n=0; n<this.selection.length; n++)
if (this.rows[this.selection[n]]) { if (this.rows[this.selection[n]]) {
$(this.rows[this.selection[n]].obj).removeClass('selected').removeClass('unfocused'); $(this.rows[this.selection[n]].obj).removeClass('selected').removeClass('unfocused');
} }
this.selection = new Array(); this.selection = [];
} }
if (num_select && !this.selection.length) if (num_select && !this.selection.length)
this.triggerEvent('select'); this.triggerEvent('select');
@ -870,25 +850,20 @@ get_single_selection: function()
*/ */
highlight_row: function(id, multiple) highlight_row: function(id, multiple)
{ {
if (this.rows[id] && !multiple) if (this.rows[id] && !multiple) {
{ if (this.selection.length > 1 || !this.in_selection(id)) {
if (this.selection.length > 1 || !this.in_selection(id))
{
this.clear_selection(); this.clear_selection();
this.selection[0] = id; this.selection[0] = id;
$(this.rows[id].obj).addClass('selected'); $(this.rows[id].obj).addClass('selected');
} }
} }
else if (this.rows[id]) else if (this.rows[id]) {
{ if (!this.in_selection(id)) { // select row
if (!this.in_selection(id)) // select row
{
this.selection[this.selection.length] = id; this.selection[this.selection.length] = id;
$(this.rows[id].obj).addClass('selected'); $(this.rows[id].obj).addClass('selected');
} }
else // unselect row else { // unselect row
{ var p = $.inArray(id, this.selection);
var p = jQuery.inArray(id, this.selection);
var a_pre = this.selection.slice(0, p); var a_pre = this.selection.slice(0, p);
var a_post = this.selection.slice(p+1, this.selection.length); var a_post = this.selection.slice(p+1, this.selection.length);
this.selection = a_pre.concat(a_post); this.selection = a_pre.concat(a_post);
@ -909,8 +884,7 @@ key_press: function(e)
var keyCode = rcube_event.get_keycode(e); var keyCode = rcube_event.get_keycode(e);
var mod_key = rcube_event.get_modifier(e); var mod_key = rcube_event.get_modifier(e);
switch (keyCode) switch (keyCode) {
{
case 40: case 40:
case 38: case 38:
case 63233: // "down", in safari keypress case 63233: // "down", in safari keypress
@ -938,11 +912,11 @@ key_press: function(e)
this.shiftkey = e.shiftKey; this.shiftkey = e.shiftKey;
this.key_pressed = keyCode; this.key_pressed = keyCode;
this.triggerEvent('keypress'); this.triggerEvent('keypress');
if (this.key_pressed == this.BACKSPACE_KEY) if (this.key_pressed == this.BACKSPACE_KEY)
return rcube_event.cancel(e); return rcube_event.cancel(e);
} }
return true; return true;
}, },
@ -951,12 +925,11 @@ key_press: function(e)
*/ */
key_down: function(e) key_down: function(e)
{ {
switch (rcube_event.get_keycode(e)) switch (rcube_event.get_keycode(e)) {
{
case 27: case 27:
if (this.drag_active) if (this.drag_active)
return this.drag_mouse_up(e); return this.drag_mouse_up(e);
case 40: case 40:
case 38: case 38:
case 63233: case 63233:
@ -967,10 +940,10 @@ key_down: function(e)
case 32: case 32:
if (!rcube_event.get_modifier(e) && this.focused) if (!rcube_event.get_modifier(e) && this.focused)
return rcube_event.cancel(e); return rcube_event.cancel(e);
default: default:
} }
return true; return true;
}, },
@ -988,8 +961,7 @@ use_arrow_key: function(keyCode, mod_key)
else if (keyCode == 38 || keyCode == 63232) // up arrow key pressed else if (keyCode == 38 || keyCode == 63232) // up arrow key pressed
new_row = this.get_prev_row(); new_row = this.get_prev_row();
if (new_row) if (new_row) {
{
this.select_row(new_row.uid, mod_key, true); this.select_row(new_row.uid, mod_key, true);
this.scrollto(new_row.uid); this.scrollto(new_row.uid);
} }
@ -1034,8 +1006,7 @@ use_plusminus_key: function(keyCode, mod_key)
scrollto: function(id) scrollto: function(id)
{ {
var row = this.rows[id].obj; var row = this.rows[id].obj;
if (row && this.frame) if (row && this.frame) {
{
var scroll_to = Number(row.offsetTop); var scroll_to = Number(row.offsetTop);
// expand thread if target row is hidden (collapsed) // expand thread if target row is hidden (collapsed)
@ -1058,17 +1029,16 @@ scrollto: function(id)
*/ */
drag_mouse_move: function(e) drag_mouse_move: function(e)
{ {
if (this.drag_start) if (this.drag_start) {
{
// check mouse movement, of less than 3 pixels, don't start dragging // check mouse movement, of less than 3 pixels, don't start dragging
var m = rcube_event.get_mouse_pos(e); var 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)) 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; return false;
if (!this.draglayer) 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 // also select childs of (collapsed) threads for dragging
var selection = $.merge([], this.selection); var selection = $.merge([], this.selection);
var depth, row, uid, r; var depth, row, uid, r;
@ -1081,42 +1051,37 @@ drag_mouse_move: function(e)
// get subjects of selected messages // get subjects of selected messages
var names = ''; var names = '';
var c, i, subject, obj; var c, i, subject, obj;
for(var n=0; n<this.selection.length; n++) for(var n=0; n<this.selection.length; n++) {
{ // only show 12 lines
if (n>12) // only show 12 lines if (n>12) {
{
names += '...'; names += '...';
break; break;
} }
if (obj = this.rows[this.selection[n]].obj) if (obj = this.rows[this.selection[n]].obj) {
{
subject = ''; subject = '';
for (c=0, i=0; i<obj.childNodes.length; i++) for (c=0, i=0; i<obj.childNodes.length; i++) {
{ if (obj.childNodes[i].nodeName == 'TD') {
if (obj.childNodes[i].nodeName == 'TD')
{
if (n == 0) if (n == 0)
this.drag_start_pos = $(obj.childNodes[i]).offset(); this.drag_start_pos = $(obj.childNodes[i]).offset();
if (this.subject_col < 0 || (this.subject_col >= 0 && this.subject_col == c)) if (this.subject_col < 0 || (this.subject_col >= 0 && this.subject_col == c)) {
{ var node, tmp_node, nodes = obj.childNodes[i].childNodes;
var node, tmp_node, nodes = obj.childNodes[i].childNodes; // find text node
// find text node for (m=0; m<nodes.length; m++) {
for (m=0; m<nodes.length; m++) { if ((tmp_node = obj.childNodes[i].childNodes[m]) && (tmp_node.nodeType==3 || tmp_node.nodeName=='A'))
if ((tmp_node = obj.childNodes[i].childNodes[m]) && (tmp_node.nodeType==3 || tmp_node.nodeName=='A')) node = tmp_node;
node = tmp_node; }
}
if (!node)
if (!node) break;
break;
subject = node.nodeType==3 ? node.data : node.innerHTML; subject = node.nodeType==3 ? node.data : node.innerHTML;
// remove leading spaces // remove leading spaces
subject = subject.replace(/^\s+/i, ''); subject = subject.replace(/^\s+/i, '');
// truncate line to 50 characters // truncate line to 50 characters
names += (subject.length > 50 ? subject.substring(0, 50)+'...' : subject) + '<br />'; names += (subject.length > 50 ? subject.substring(0, 50)+'...' : subject) + '<br />';
break; break;
} }
c++; c++;
@ -1132,8 +1097,7 @@ drag_mouse_move: function(e)
this.triggerEvent('dragstart'); this.triggerEvent('dragstart');
} }
if (this.drag_active && this.draglayer) if (this.drag_active && this.draglayer) {
{
var pos = rcube_event.get_mouse_pos(e); var pos = rcube_event.get_mouse_pos(e);
this.draglayer.css({ left:(pos.x+20)+'px', top:(pos.y-5 + (bw.ie ? document.documentElement.scrollTop : 0))+'px' }); this.draglayer.css({ left:(pos.x+20)+'px', top:(pos.y-5 + (bw.ie ? document.documentElement.scrollTop : 0))+'px' });
this.triggerEvent('dragmove', e?e:window.event); this.triggerEvent('dragmove', e?e:window.event);

Loading…
Cancel
Save