From 6204390af16bcf50f82da61a1aefc2ad0c0adf94 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 01 May 2006 10:47:27 -0400
Subject: [PATCH] Applied patch for requesting receipts by Salvatore Ansani
---
program/js/app.js | 351 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 266 insertions(+), 85 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index d4c55ec..0a57469 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -7,16 +7,12 @@
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com> |
+ | Authors: Thomas Bruederli <roundcube@gmail.com> |
+ | Charles McNulty <charles@charlesmcnulty.com> |
+-----------------------------------------------------------------------+
$Id$
-
- Modifications:
- 2006/01/19: Applied patch for ctrl/shift behavior by Charles McNulty <charles@charlesmcnulty.com>
-
*/
-
// Constants
var CONTROL_KEY = 1;
var SHIFT_KEY = 2;
@@ -32,6 +28,7 @@
this.gui_objects = new Object();
this.commands = new Object();
this.selection = new Array();
+ this.last_selected = 0;
// create public reference to myself
rcube_webmail_client = this;
@@ -115,15 +112,17 @@
switch (this.task)
{
case 'mail':
+ var msg_list_frame = this.gui_objects.mailcontframe;
var msg_list = this.gui_objects.messagelist;
if (msg_list)
{
+ msg_list_frame.onmousedown = function(e){return rcube_webmail_client.click_on_list(e);};
this.init_messagelist(msg_list);
this.enable_command('markread', true);
}
// enable mail commands
- this.enable_command('list', 'compose', 'add-contact', true);
+ this.enable_command('list', 'compose', 'add-contact', 'search', 'reset-search', true);
if (this.env.action=='show')
{
@@ -146,6 +145,9 @@
if (this.env.messagecount)
this.enable_command('select-all', 'select-none', 'sort', 'expunge', true);
+
+ if (this.env.messagecount && this.env.mailbox==this.env.trash_mailbox)
+ this.enable_command('purge', true);
this.set_page_buttons();
@@ -230,8 +232,13 @@
this.enable_command('logout', true);
// disable browser's contextmenus
- document.oncontextmenu = function(){ return false; }
+ // document.oncontextmenu = function(){ return false; }
+ // load body click event
+ document.onmousedown = function(){ return rcube_webmail_client.reset_click(); };
+ document.onkeydown = function(e){ return rcube_webmail_client.key_pressed(e, msg_list_frame); };
+
+
// flag object as complete
this.loaded = true;
@@ -242,16 +249,75 @@
// start interval for keep-alive/recent_check signal
if (this.kepp_alive_interval && this.task=='mail' && this.gui_objects.messagelist)
this.kepp_alive_int = setInterval(this.ref+'.check_for_recent()', this.kepp_alive_interval);
- else
+ else if (this.task!='login')
this.kepp_alive_int = setInterval(this.ref+'.send_keep_alive()', this.kepp_alive_interval);
};
+ // reset last clicked if user clicks on anything other than the message table
+ this.reset_click = function()
+ {
+ this.in_message_list = false;
+ };
+
+ this.click_on_list = function(e)
+ {
+ if (!e)
+ e = window.event;
+
+ this.in_message_list = true;
+ e.cancelBubble = true;
+ };
+
+ this.key_pressed = function(e, msg_list_frame) {
+ if (this.in_message_list != true)
+ return true;
+ var keyCode = document.layers ? e.which : document.all ? event.keyCode : document.getElementById ? e.keyCode : 0;
+ var mod_key = this.get_modifier(e);
+ switch (keyCode) {
+ case 40:
+ case 38:
+ return this.use_arrow_key(keyCode, mod_key, msg_list_frame);
+ break;
+ case 46:
+ return this.use_delete_key(keyCode, mod_key, msg_list_frame);
+ break;
+ default:
+ return true;
+ }
+ }
+
+ this.use_arrow_key = function(keyCode, mod_key, msg_list_frame) {
+ var scroll_to = 0;
+ if (keyCode == 40) { // down arrow key pressed
+ new_row = this.get_next_row();
+ if (!new_row) return false;
+ scroll_to = (Number(new_row.offsetTop) + Number(new_row.offsetHeight)) - Number(msg_list_frame.offsetHeight);
+ } else if (keyCode == 38) { // up arrow key pressed
+ new_row = this.get_prev_row();
+ if (!new_row) return false;
+ scroll_to = new_row.offsetTop;
+ } else {return true;}
+
+ this.select_row(new_row.uid,mod_key,true);
+
+ if (((Number(new_row.offsetTop)) < (Number(msg_list_frame.scrollTop))) ||
+ ((Number(new_row.offsetTop) + Number(new_row.offsetHeight)) > (Number(msg_list_frame.scrollTop) + Number(msg_list_frame.offsetHeight)))) {
+ msg_list_frame.scrollTop = scroll_to;
+ }
+ return false;
+ };
+
+ this.use_delete_key = function(keyCode, mod_key, msg_list_frame){
+ this.command('delete','',this);
+ return false;
+ }
// get all message rows from HTML table and init each row
this.init_messagelist = function(msg_list)
{
if (msg_list && msg_list.tBodies[0])
{
+
this.message_rows = new Array();
var row;
@@ -286,7 +352,7 @@
// set eventhandlers to table row
row.onmousedown = function(e){ return rcube_webmail_client.drag_row(e, this.uid); };
row.onmouseup = function(e){ return rcube_webmail_client.click_row(e, this.uid); };
-
+
if (document.all)
row.onselectstart = function() { return false; };
@@ -389,7 +455,7 @@
this.list_rows = this.contact_rows;
if (this.env.cid)
- this.select(this.env.cid);
+ this.highlight_row(this.env.cid);
};
@@ -453,7 +519,7 @@
this.list_rows = this.identity_rows;
if (this.env.iid)
- this.select(this.env.iid);
+ this.highlight_row(this.env.iid);
};
@@ -514,7 +580,11 @@
// misc list commands
case 'list':
if (this.task=='mail')
+ {
+ if (this.env.search_request<0 || (this.env.search_request && props != this.env.mailbox))
+ this.reset_qsearch();
this.list_mailbox(props);
+ }
else if (this.task=='addressbook')
this.list_contacts();
break;
@@ -565,9 +635,10 @@
this.expunge_mailbox(this.env.mailbox);
break;
- case 'clear-mailbox':
- //if (this.env.messagecount)
- //this.clear_mailbox(this.env.mailbox);
+ case 'purge':
+ case 'empty-mailbox':
+ if (this.env.messagecount)
+ this.purge_mailbox(this.env.mailbox);
break;
@@ -770,14 +841,17 @@
}
else if (props)
url += '&_to='+props;
-
+
// don't know if this is necessary...
url = url.replace(/&_framed=1/, "");
this.set_busy(true);
// need parent in case we are coming from the contact frame
- parent.window.location.href = url;
+ if (this.env.framed)
+ parent.location.href = url;
+ else
+ location.href = url;
break;
case 'send':
@@ -843,6 +917,22 @@
this.add_contact(props);
break;
+ // mail quicksearch
+ case 'search':
+ if (!props && this.gui_objects.qsearchbox)
+ props = this.gui_objects.qsearchbox.value;
+ if (props)
+ this.qsearch(escape(props), this.env.mailbox);
+ break;
+
+ // reset quicksearch
+ case 'reset-search':
+ var s = this.env.search_request;
+ this.reset_qsearch();
+
+ if (s)
+ this.list_mailbox(this.env.mailbox);
+ break;
// ldap search
case 'ldappublicsearch':
@@ -1011,26 +1101,8 @@
// selects currently unselected row
if (!this.in_selection_before)
{
- var mod_key = this.get_modifier(e);
- if (!mod_key) {
- this.select(id, false);
- this.last_selected = id;
- } else {
- switch (mod_key) {
- case SHIFT_KEY: { this.shift_select(id,false); break; }
- case CONTROL_KEY: {
- this.select(id, true);
- this.last_selected = id;
- break;
- }
- case CONTROL_SHIFT_KEY: { this.shift_select(id,true); break;}
- default: {
- this.select(id, false);
- this.last_selected = id;
- break;
- }
- }
- }
+ var mod_key = this.get_modifier(e);
+ this.select_row(id,mod_key,false);
}
if (this.selection.length)
@@ -1048,7 +1120,7 @@
this.click_row = function(e, id)
{
var mod_key = this.get_modifier(e);
-
+
// don't do anything (another action processed before)
if (this.dont_select)
{
@@ -1057,32 +1129,14 @@
}
// unselects currently selected row
- if (!this.drag_active && this.in_selection_before==id) {
- if (!mod_key) {
- this.last_selected = id;
- this.select(id, false);
- } else {
- switch (mod_key) {
- case SHIFT_KEY: { this.shift_select(id,false); break; }
- case CONTROL_KEY: {
- this.last_selected = id;
- this.select(id, (this.task!='settings'));
- break;
- }
- case CONTROL_SHIFT_KEY: {this.shift_select(id,true);break;}
- default: {
- this.select(id, false);
- this.last_selected = id;
- break;
- }
- }
- }
- }
+ if (!this.drag_active && this.in_selection_before==id)
+ this.select_row(id,mod_key,false);
+
this.drag_start = false;
this.in_selection_before = false;
// row was double clicked
- if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked)
+ if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked && !mod_key)
{
this.show_message(id);
return false;
@@ -1150,9 +1204,27 @@
/********* (message) list functionality *********/
/*********************************************************/
-
- // select/unselect a row
- this.select = function(id, multiple)
+ // get next and previous rows that are not hidden
+ this.get_next_row = function(){
+ var last_selected_row = this.list_rows[this.last_selected];
+ var new_row = last_selected_row.obj.nextSibling;
+ while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none')) {
+ new_row = new_row.nextSibling;
+ }
+ return new_row;
+ }
+
+ this.get_prev_row = function(){
+ var last_selected_row = this.list_rows[this.last_selected];
+ var new_row = last_selected_row.obj.previousSibling;
+ while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none')) {
+ new_row = new_row.previousSibling;
+ }
+ return new_row;
+ }
+
+ // highlight/unhighlight a row
+ this.highlight_row = function(id, multiple)
{
var selected = false
@@ -1169,7 +1241,7 @@
if (!this.in_selection(id)) // select row
{
this.selection[this.selection.length] = id;
- this.set_classname(this.list_rows[id].obj, 'selected', true);
+ this.set_classname(this.list_rows[id].obj, 'selected', true);
}
else // unselect row
{
@@ -1196,10 +1268,39 @@
};
-// select all rows from the last selected row to the current one, while deselecting all other rows
- this.shift_select = function(id,control)
- {
- var from_rowIndex = this.list_rows[this.last_selected].obj.rowIndex;
+// selects or unselects the proper row depending on the modifier key pressed
+ this.select_row = function(id,mod_key,with_arrow) {
+ if (!mod_key) {
+ this.shift_start = id;
+ this.highlight_row(id, false);
+ } else {
+ switch (mod_key) {
+ case SHIFT_KEY: {
+ this.shift_select(id,false);
+ break; }
+ case CONTROL_KEY: {
+ this.shift_start = id;
+ if (!with_arrow)
+ this.highlight_row(id, true);
+ break;
+ }
+ case CONTROL_SHIFT_KEY: {
+ this.shift_select(id,true);
+ break;
+ }
+ default: {
+ this.highlight_row(id, false);
+ break;
+ }
+ }
+ }
+ if (this.last_selected != 0) { this.set_classname(this.list_rows[this.last_selected].obj, 'focused', false);}
+ this.last_selected = id;
+ this.set_classname(this.list_rows[id].obj, 'focused', true);
+ };
+
+ this.shift_select = function(id, control) {
+ var from_rowIndex = this.list_rows[this.shift_start].obj.rowIndex;
var to_rowIndex = this.list_rows[id].obj.rowIndex;
var i = ((from_rowIndex < to_rowIndex)? from_rowIndex : to_rowIndex);
@@ -1209,10 +1310,10 @@
for (var n in this.list_rows) {
if ((this.list_rows[n].obj.rowIndex >= i) && (this.list_rows[n].obj.rowIndex <= j)) {
if (!this.in_selection(n))
- this.select(n, true);
+ this.highlight_row(n, true);
} else {
if (this.in_selection(n) && !control)
- this.select(n, true);
+ this.highlight_row(n, true);
}
}
};
@@ -1250,7 +1351,7 @@
for (var n in this.list_rows)
if (!filter || this.list_rows[n][filter]==true)
- this.select(n, true);
+ this.highlight_row(n, true);
};
@@ -1300,6 +1401,7 @@
// list messages of a specific mailbox
this.list_mailbox = function(mbox, page, sort)
{
+ this.last_selected = 0;
var add_url = '';
var target = window;
@@ -1318,6 +1420,10 @@
this.env.current_page = page;
this.clear_selection();
}
+
+ // also send search request to get the right messages
+ if (this.env.search_request)
+ add_url += '&_search='+this.env.search_request;
if (this.env.mailbox!=mbox)
this.select_mailbox(mbox);
@@ -1389,6 +1495,28 @@
};
+ this.purge_mailbox = function(mbox)
+ {
+ var lock = false;
+ var add_url = '';
+
+ if (!confirm(this.get_label('purgefolderconfirm')))
+ return false;
+
+ // lock interface if it's the active mailbox
+ if (mbox == this.env.mailbox)
+ {
+ lock = true;
+ this.set_busy(true, 'loading');
+ add_url = '&_reload=1';
+ }
+
+ // send request to server
+ var url = '_mbox='+escape(mbox);
+ this.http_request('purge', url+add_url, lock);
+ };
+
+
// move selected messages to the specified mailbox
this.move_messages = function(mbox)
{
@@ -1412,6 +1540,10 @@
if (this.message_rows[id].obj)
this.message_rows[id].obj.style.display = 'none';
}
+ next_row = this.get_next_row();
+ prev_row = this.get_prev_row();
+ new_row = (next_row) ? next_row : prev_row;
+ this.select_row(new_row.uid,false,false);
}
var lock = false;
@@ -1452,6 +1584,10 @@
this.message_rows[id].obj.style.display = 'none';
}
}
+ next_row = this.get_next_row();
+ prev_row = this.get_prev_row();
+ new_row = (next_row) ? next_row : prev_row;
+ this.select_row(new_row.uid,false,false);
// send request to server
this.http_request('delete', '_uid='+a_uids.join(',')+'&_mbox='+escape(this.env.mailbox)+'&_from='+(this.env.action ? this.env.action : ''));
@@ -1731,6 +1867,26 @@
this.http_request('addcontact', '_address='+value);
};
+ // send remote request to search mail
+ this.qsearch = function(value, mbox)
+ {
+ if (value && mbox)
+ {
+ this.clear_message_list();
+ this.set_busy(true, 'searching');
+ this.http_request('search', '_search='+value+'&_mbox='+mbox, true);
+ }
+ };
+
+ // reset quick-search form
+ this.reset_qsearch = function()
+ {
+ if (this.gui_objects.qsearchbox)
+ this.gui_objects.qsearchbox.value = '';
+
+ this.env.search_request = null;
+ };
+
/*********************************************************/
/********* keyboard live-search methods *********/
@@ -2022,6 +2178,7 @@
return false;
//if (this.env.framed && add_url=='')
+
// add_url = '&_framed=1';
if (action && (cid || action=='add'))
@@ -2035,9 +2192,9 @@
this.delete_contacts = function()
{
// exit if no mailbox specified or if selection is empty
- if (!(this.selection.length || this.env.cid))
+ if (!(this.selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm')))
return;
-
+
var a_cids = new Array();
if (this.env.cid)
@@ -2572,6 +2729,13 @@
this.set_page_buttons();
};
+ // replace content of quota display
+ this.set_quota = function(text)
+ {
+ if (this.gui_objects.quotadisplay)
+ this.gui_objects.quotadisplay.innerHTML = text;
+ };
+
// update the mailboxlist
this.set_unread_count = function(mbox, count, set_title)
@@ -2601,10 +2765,10 @@
}
// set unread count to window title
- if (set_title && document.title)
+ reg = /^\([0-9]+\)\s+/i;
+ if (set_title && count && document.title)
{
var doc_title = String(document.title);
- reg = /^\([0-9]+\)\s+/i;
if (count && doc_title.match(reg))
document.title = doc_title.replace(reg, '('+count+') ');
@@ -2612,6 +2776,11 @@
document.title = '('+count+') '+doc_title;
else
document.title = doc_title.replace(reg, '');
+ }
+ // remove unread count from window title
+ else if (document.title)
+ {
+ document.title = document.title.replace(reg, '');
}
};
@@ -2775,7 +2944,7 @@
if (request_obj.__lock)
this.set_busy(false);
- console(request_obj.responseText);
+ console(request_obj.get_text());
// if we get javascript code from server -> execute it
if (request_obj.get_text() && (ctype=='text/javascript' || ctype=='application/x-javascript'))
@@ -2791,9 +2960,12 @@
break;
case 'list':
+ if (this.env.messagecount)
+ this.enable_command('purge', (this.env.mailbox==this.env.trash_mailbox));
+
case 'expunge':
this.enable_command('select-all', 'select-none', 'expunge', this.env.messagecount ? true : false);
- break;
+ break;
}
request_obj.reset();
@@ -2847,6 +3019,8 @@
};
+/* deprecated methods
+
// check if Shift-key is pressed on event
this.check_shiftkey = function(e)
{
@@ -2876,22 +3050,29 @@
else
return false;
}
+*/
-
-// returns modifier key (constants defined at top of file)
+ // returns modifier key (constants defined at top of file)
this.get_modifier = function(e)
{
var opcode = 0;
- if (e = e || window.event)
- {
+ e = e || window.event;
+
+ if (bw.mac && e)
+ {
+ opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
+ return opcode;
+ }
+ if (e)
+ {
opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
- return opcode;
- }
+ return opcode;
+ }
if (e.cancelBubble)
- {
+ {
e.cancelBubble = true;
e.returnValue = false;
- }
+ }
else if (e.preventDefault)
e.preventDefault();
}
--
Gitblit v1.9.1