From 3d35312cc4badb64a2c26db8e80c1a01f2d1c12b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 12 Apr 2008 13:37:22 -0400
Subject: [PATCH] - Fixed and optimized 'read_when_deleted': mark as read on server side in one action when marking as deleted, fixed js bugs when deleting from message preview page
---
program/js/app.js | 340 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 202 insertions(+), 138 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 0509395..3ed6817 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -132,7 +132,7 @@
this.message_list.addEventListener('dblclick', function(o){ p.msglist_dbl_click(o); });
this.message_list.addEventListener('keypress', function(o){ p.msglist_keypress(o); });
this.message_list.addEventListener('select', function(o){ p.msglist_select(o); });
- this.message_list.addEventListener('dragstart', function(o){ p.drag_active = true; });
+ this.message_list.addEventListener('dragstart', function(o){ p.drag_active = true; if (p.preview_timer) clearTimeout(p.preview_timer); });
this.message_list.addEventListener('dragend', function(o){ p.drag_active = false; });
this.message_list.init();
@@ -179,7 +179,6 @@
{
this.enable_command('compose', 'add-contact', false);
parent.rcmail.show_contentframe(true);
- parent.rcmail.mark_message('read', this.env.uid);
}
if ((this.env.action=='show' || this.env.action=='preview') && this.env.blockedobjects)
@@ -202,7 +201,7 @@
}
if (this.env.messagecount)
- this.enable_command('select-all', 'select-none', 'sort', 'expunge', true);
+ this.enable_command('select-all', 'select-none', 'expunge', true);
if (this.env.messagecount && (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox))
this.enable_command('purge', true);
@@ -311,10 +310,10 @@
break;
case 'login':
- var input_user = rcube_find_object('_user');
- var input_pass = rcube_find_object('_pass');
+ var input_user = rcube_find_object('rcmloginuser');
+ var input_pass = rcube_find_object('rcmloginpwd');
if (input_user)
- input_user.onkeypress = function(e){ return rcmail.login_user_keypress(e); };
+ input_user.onkeyup = function(e){ return rcmail.login_user_keyup(e); };
if (input_user && input_user.value=='')
input_user.focus();
else if (input_pass)
@@ -488,7 +487,7 @@
break;
case 'logout':
- this.goto_url('logout', true);
+ this.goto_url('logout', '', true);
break;
// commands to switch task
@@ -695,7 +694,7 @@
if (props._row.uid)
{
uid = props._row.uid;
- this.message_list.dont_select = true;
+
// toggle read/unread
if (this.message_list.rows[uid].deleted) {
flag = 'undelete';
@@ -712,7 +711,7 @@
break;
case 'load-attachment':
- var qstring = '_mbox='+this.env.mailbox+'&_uid='+this.env.uid+'&_part='+props.part;
+ var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props.part;
// open attachment in frame if it's of a supported mimetype
if (this.env.uid && props.mimetype && find_in_array(props.mimetype, this.mimetypes)>=0)
@@ -892,7 +891,7 @@
{
setTimeout(function(){ ref.printwin.focus(); }, 20);
if (this.env.action != 'show')
- this.toggle_read_status('read', [uid]);
+ this.mark_message('read', uid);
}
}
break;
@@ -1095,15 +1094,11 @@
// onmouseup handler for folder list item
this.folder_mouse_up = function(id)
{
- // Hide message command buttons until a message is selected
- this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', false);
-
if (this.drag_active)
{
this.unfocus_folder(id);
this.command('moveto', id);
}
-
};
this.click_on_list = function(e)
@@ -1142,7 +1137,7 @@
}
// start timer for message preview (wait for double click)
- if (selected && this.env.contentframe)
+ if (selected && this.env.contentframe && !list.multi_selecting)
this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, this.dblclick_time + 10);
else if (this.env.contentframe)
this.show_contentframe(false);
@@ -1387,11 +1382,8 @@
this.move_messages = function(mbox)
{
// exit if current or no mailbox specified or if selection is empty
- if (!mbox || !this.env.uid || mbox==this.env.mailbox)
- {
- if (!this.message_list || !this.message_list.get_selection().length)
- return;
- }
+ if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
+ return;
var lock = false;
var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
@@ -1405,6 +1397,9 @@
else
this.show_contentframe(false);
+ // Hide message command buttons until a message is selected
+ this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', false);
+
this._with_selected_messages('moveto', lock, add_url);
};
@@ -1412,7 +1407,7 @@
this.delete_messages = function()
{
var selection = this.message_list ? this.message_list.get_selection() : new Array();
-
+
// exit if no mailbox specified or if selection is empty
if (!this.env.uid && !selection.length)
return;
@@ -1463,8 +1458,9 @@
this._with_selected_messages = function(action, lock, add_url)
{
var a_uids = new Array();
+
if (this.env.uid)
- a_uids[a_uids.length] = this.env.uid;
+ a_uids[0] = this.env.uid;
else
{
var selection = this.message_list.get_selection();
@@ -1473,10 +1469,11 @@
{
id = selection[n];
a_uids[a_uids.length] = id;
+
this.message_list.remove_row(id, (n == selection.length-1));
}
}
-
+
// also send search request to get the right messages
if (this.env.search_request)
add_url += '&_search='+this.env.search_request;
@@ -1490,36 +1487,49 @@
this.mark_message = function(flag, uid)
{
var a_uids = new Array();
+ var r_uids = new Array();
var selection = this.message_list ? this.message_list.get_selection() : new Array();
-
+
if (uid)
a_uids[0] = uid;
else if (this.env.uid)
a_uids[0] = this.env.uid;
else if (this.message_list)
{
- for (var id, n=0; n<selection.length; n++)
+ for (var n=0; n<selection.length; n++)
{
- id = selection[n];
- if ((flag=='read' && this.message_list.rows[id].unread) || (flag=='unread' && !this.message_list.rows[id].unread)
- || (flag=='delete' && !this.message_list.rows[id].deleted) || (flag=='undelete' && this.message_list.rows[id].deleted))
- a_uids[a_uids.length] = id;
+ a_uids[a_uids.length] = selection[n];
}
}
-
+
+ if (!this.message_list)
+ r_uids = a_uids;
+ else
+ for (var id, n=0; n<a_uids.length; n++)
+ {
+ id = a_uids[n];
+ if ((flag=='read' && this.message_list.rows[id].unread)
+ || (flag=='unread' && !this.message_list.rows[id].unread)
+ || (flag=='delete' && !this.message_list.rows[id].deleted)
+ || (flag=='undelete' && this.message_list.rows[id].deleted))
+ {
+ r_uids[r_uids.length] = id;
+ }
+ }
+
// nothing to do
- if (!a_uids.length)
+ if (!r_uids.length)
return;
-
+
switch (flag)
{
case 'read':
case 'unread':
- this.toggle_read_status(flag, a_uids);
+ this.toggle_read_status(flag, r_uids);
break;
case 'delete':
case 'undelete':
- this.toggle_delete_status(a_uids);
+ this.toggle_delete_status(r_uids);
break;
}
};
@@ -1560,24 +1570,40 @@
rows[uid].icon.src = icn_src;
}
}
-
+
this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
};
+
+ // set class to read/unread
+ this.mark_as_read_from_preview = function(uid)
+ {
+ var icn_src;
+ var rows = parent.rcmail.message_list.rows;
+ if(rows[uid].unread)
+ {
+ rows[uid].unread = false;
+ rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
+ parent.rcmail.set_classname(rows[uid].obj, 'unread', false);
+
+ if (rows[uid].replied && parent.rcmail.env.repliedicon)
+ icn_src = parent.rcmail.env.repliedicon;
+ else if (parent.rcmail.env.messageicon)
+ icn_src = parent.rcmail.env.messageicon;
+
+ if (rows[uid].icon && icn_src)
+ rows[uid].icon.src = icn_src;
+ }
+ }
+
// mark all message rows as deleted/undeleted
this.toggle_delete_status = function(a_uids)
{
- if (this.env.read_when_deleted)
- this.toggle_read_status('read',a_uids);
-
- // if deleting message from "view message" don't bother with delete icon
- if (this.env.action == "show")
- return false;
-
- var rows = this.message_list.rows;
+ var rows = this.message_list ? this.message_list.rows : new Array();
+
if (a_uids.length==1)
{
- if (rows[a_uids[0]] && rows[a_uids[0]].classname.indexOf('deleted') < 0)
+ if (!rows.length || (rows[a_uids[0]] && rows[a_uids[0]].classname.indexOf('deleted') < 0))
this.flag_as_deleted(a_uids);
else
this.flag_as_undeleted(a_uids);
@@ -1609,12 +1635,8 @@
this.flag_as_undeleted = function(a_uids)
{
- // if deleting message from "view message" don't bother with delete icon
- if (this.env.action == "show")
- return false;
-
var icn_src;
- var rows = this.message_list.rows;
+ var rows = this.message_list ? this.message_list.rows : new Array();
for (var i=0; i<a_uids.length; i++)
{
@@ -1633,6 +1655,7 @@
icn_src = this.env.repliedicon;
else if (this.env.messageicon)
icn_src = this.env.messageicon;
+
if (rows[uid].icon && icn_src)
rows[uid].icon.src = icn_src;
}
@@ -1645,37 +1668,73 @@
this.flag_as_deleted = function(a_uids)
{
- // if deleting message from "view message" don't bother with delete icon
- if (this.env.action == "show")
- return false;
-
- var rows = this.message_list.rows;
+ var add_url = '';
+ var r_uids = new Array();
+ var rows = this.message_list ? this.message_list.rows : new Array();
+
for (var i=0; i<a_uids.length; i++)
- {
+ {
uid = a_uids[i];
- if (rows[uid]) {
+ if (rows[uid])
+ {
rows[uid].deleted = true;
- if (rows[uid].classname.indexOf('deleted')<0) {
+ if (rows[uid].classname.indexOf('deleted')<0)
+ {
rows[uid].classname += ' deleted';
this.set_classname(rows[uid].obj, 'deleted', true);
- }
- if (rows[uid].icon && this.env.deletedicon)
+ }
+
+ if (rows[uid].icon && this.env.deletedicon)
rows[uid].icon.src = this.env.deletedicon;
- }
- }
- this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete');
+ if (rows[uid].unread)
+ r_uids[r_uids.length] = uid;
+ }
+ }
+
+ if (r_uids.length)
+ add_url = '&_ruid='+r_uids.join(',');
+
+ this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete'+add_url);
return true;
};
+
+ // flag as read without mark request (called from backend)
+ // argument should be a coma-separated list of uids
+ this.flag_deleted_as_read = function(uids)
+ {
+ var icn_src;
+ var rows = this.message_list ? this.message_list.rows : new Array();
+ var str = String(uids);
+ var a_uids = new Array();
+
+ a_uids = str.split(',');
+
+ for (var uid, i=0; i<a_uids.length; i++)
+ {
+ uid = a_uids[i];
+ if (rows[uid])
+ {
+ rows[uid].unread = false;
+ rows[uid].read = true;
+
+ rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
+ this.set_classname(rows[uid].obj, 'unread', false);
+
+ if (rows[uid].icon)
+ rows[uid].icon.src = this.env.deletedicon;
+ }
+ }
+ };
/*********************************************************/
/********* login form methods *********/
/*********************************************************/
// handler for keyboard events on the _user field
- this.login_user_keypress = function(e)
+ this.login_user_keyup = function(e)
{
var key = rcube_event.get_keycode(e);
var elm;
@@ -2014,7 +2073,7 @@
// reset vars
this.env.current_page = 1;
this.set_busy(true, 'searching');
- this.http_request('search', '_q='+urlencode(value)+(this.env.mailbox ? '&_mbox='+this.env.mailbox : '')+(this.env.source ? '&_source='+urlencode(this.env.source) : ''), true);
+ this.http_request('search', '_q='+urlencode(value)+(this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : '')+(this.env.source ? '&_source='+urlencode(this.env.source) : ''), true);
}
return true;
};
@@ -2112,6 +2171,22 @@
};
+ // handler for mouse events on address-fields
+ this.ksearch_onmousemove = function(li)
+ {
+ var last = document.getElementById('rcmksearchSelected');
+ if (last)
+ {
+ last.removeAttribute('id');
+ this.set_classname(last, 'selected', false);
+ }
+
+ li.setAttribute('id', 'rcmksearchSelected');
+ this.set_classname(li, 'selected', true);
+ this.ksearch_selected = li._rcm_id;
+ };
+
+
this.insert_recipient = function(id)
{
if (!this.env.contacts[id] || !this.ksearch_input)
@@ -2202,7 +2277,8 @@
li = document.createElement('LI');
li.innerHTML = a_results[i].replace(/</, '<').replace(/>/, '>');
li.onmousedown = function(e){ ref.insert_recipient(this._rcm_id); ref.ksearch_pane.show(0); return rcube_event.cancel(e); };
- li.style.cursor = 'pointer';
+ li.onmouseover = function(e){ ref.ksearch_onmousemove(this); };
+ li.style.cursor = 'pointer';
li._rcm_id = a_result_ids[i];
ul.appendChild(li);
}
@@ -2685,6 +2761,10 @@
{
this.http_post('delete-folder', '_mboxes='+urlencode(folder));
this.set_env('folder', null);
+
+ if (this.gui_objects.createfolderhint)
+ this.gui_objects.createfolderhint.innerHTML = '';
+
}
};
@@ -2702,8 +2782,14 @@
var refrow, form;
var tbody = this.gui_objects.subscriptionlist.tBodies[0];
- var id = replace && replace.id ? replace.id : 'rcmrow'+(tbody.childNodes.length+1);
+ var id = 'rcmrow'+(tbody.childNodes.length+1);
var selection = this.subscription_list.get_single_selection();
+
+ if (replace && replace.id)
+ {
+ id = replace.id;
+ refid = replace.id;
+ }
if (!id || !(refrow = document.getElementById(refid)))
{
@@ -2720,18 +2806,23 @@
else
tbody.appendChild(row);
}
-
+
// add to folder/row-ID map
this.env.subscriptionrows[row.id] = [name, display_name];
// set folder name
row.cells[0].innerHTML = display_name;
- if (row.cells[1] && row.cells[1].firstChild.tagName=='INPUT')
+
+ // set messages count to zero
+ if (!replace)
+ row.cells[1].innerHTML = '*';
+
+ if (!replace && row.cells[2] && row.cells[2].firstChild.tagName=='INPUT')
{
- row.cells[1].firstChild.value = name;
- row.cells[1].firstChild.checked = true;
+ row.cells[2].firstChild.value = name;
+ row.cells[2].firstChild.checked = true;
}
-
+
// add new folder to rename-folder list and clear input field
if (!replace && (form = this.gui_objects.editform))
{
@@ -2809,59 +2900,17 @@
this.subscribe_folder = function(folder)
{
- var form;
- if ((form = this.gui_objects.editform) && form.elements['_unsubscribed'])
- this.change_subscription('_unsubscribed', '_subscribed', 'subscribe');
- else if (folder)
- this.http_post('subscribe', '_mboxes='+urlencode(folder));
+ if (folder)
+ this.http_post('subscribe', '_mbox='+urlencode(folder));
};
this.unsubscribe_folder = function(folder)
{
- var form;
- if ((form = this.gui_objects.editform) && form.elements['_subscribed'])
- this.change_subscription('_subscribed', '_unsubscribed', 'unsubscribe');
- else if (folder)
- this.http_post('unsubscribe', '_mboxes='+urlencode(folder));
+ if (folder)
+ this.http_post('unsubscribe', '_mbox='+urlencode(folder));
};
-
- this.change_subscription = function(from, to, action)
- {
- var form;
- if (form = this.gui_objects.editform)
- {
- var a_folders = new Array();
- var list_from = form.elements[from];
-
- for (var i=0; list_from && i<list_from.options.length; i++)
- {
- if (list_from.options[i] && list_from.options[i].selected)
- {
- a_folders[a_folders.length] = list_from.options[i].value;
- list_from[i] = null;
- i--;
- }
- }
-
- // yes, we have some folders selected
- if (a_folders.length)
- {
- var list_to = form.elements[to];
- var index;
-
- for (var n=0; n<a_folders.length; n++)
- {
- index = list_to.options.length;
- list_to[index] = new Option(a_folders[n]);
- }
-
- this.http_post(action, '_mboxes='+urlencode(a_folders.join(',')));
- }
- }
-
- };
// helper method to find a specific mailbox row ID
this.get_folder_row_id = function(folder)
@@ -3258,16 +3307,13 @@
this.set_page_buttons();
};
+
// replace content of quota display
- this.set_quota = function()
+ this.set_quota = function(content)
{
- if (this.gui_objects.quotadisplay &&
- this.gui_objects.quotadisplay.attributes.getNamedItem('display') &&
- this.gui_objects.quotadisplay.attributes.getNamedItem('id'))
- this.http_request('quotadisplay', '_display='+
- this.gui_objects.quotadisplay.attributes.getNamedItem('display').nodeValue+
- '&_id='+this.gui_objects.quotadisplay.attributes.getNamedItem('id').nodeValue, false);
- };
+ if (this.gui_objects.quotadisplay && content)
+ this.gui_objects.quotadisplay.innerHTML = content;
+ };
// update the mailboxlist
@@ -3276,11 +3322,8 @@
if (!this.gui_objects.mailboxlist)
return false;
- var reg, text_obj;
- var item = this.get_folder_li(mbox);
- mbox = String(mbox).toLowerCase().replace(this.identifier_expr, '');
-
- if (item && item.className && item.className.indexOf('mailbox '+mbox)>=0)
+ var reg, text_obj, item;
+ if (item = this.get_folder_li(mbox))
{
// set new text
text_obj = item.firstChild;
@@ -3315,7 +3358,12 @@
}
};
-
+ // update parent's mailboxlist (from preview)
+ this.set_unread_count_from_preview = function(mbox, count, set_title)
+ {
+ parent.rcmail.set_unread_count(mbox, count, set_title);
+ }
+
// add row to contacts list
this.add_contact_row = function(cid, cols, select)
{
@@ -3477,22 +3525,38 @@
// process the response data according to the sent action
switch (request_obj.__action)
{
+
case 'delete':
case 'moveto':
if (this.env.action=='show')
this.command('list');
else if (this.message_list)
this.message_list.init();
- break;
+
+ case 'purge':
+ case 'expunge':
+ if (!this.env.messagecount)
+ {
+ // clear preview pane content
+ if (this.env.contentframe)
+ this.show_contentframe(false);
+ // disable commands useless when mailbox is empty
+ this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 'mark', 'viewsource',
+ 'print', 'load-attachment', 'purge', 'expunge', 'select-all', 'select-none', 'sort', false);
+ }
+
+ break;
case 'list':
- if (this.env.messagecount)
- this.enable_command('purge', (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox));
- this.msglist_select(this.message_list);
+ this.msglist_select(this.message_list);
- case 'expunge':
- this.enable_command('select-all', 'select-none', 'expunge', this.env.messagecount ? true : false);
- break;
+ case 'check-recent':
+ case 'getunread':
+ this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
+ this.enable_command('purge', (this.env.messagecount && (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox)));
+
+ break;
+
}
request_obj.reset();
--
Gitblit v1.9.1