From 677e1f26fe47cc0c3e0819cb99a9024af49a619c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 18 May 2010 06:25:29 -0400
Subject: [PATCH] - Some files from /bin + spellchecking actions moved to the new 'utils' task
---
program/js/app.js | 700 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 438 insertions(+), 262 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 1358c36..dfd7c9f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -50,7 +50,6 @@
this.env.request_timeout = 180; // seconds
this.env.draft_autosave = 0; // seconds
this.env.comm_path = './';
- this.env.bin_path = './bin/';
this.env.blankpage = 'program/blank.gif';
// set jQuery ajax options
@@ -87,7 +86,7 @@
if (sel) button_prop.sel = sel;
if (over) button_prop.over = over;
- this.buttons[command][this.buttons[command].length] = button_prop;
+ this.buttons[command].push(button_prop);
};
// register a specific gui object
@@ -121,7 +120,7 @@
// execute the given script on load
this.add_onload = function(f)
{
- this.onloads[this.onloads.length] = f;
+ this.onloads.push(f);
};
// initialize webmail client
@@ -165,8 +164,10 @@
if (this.gui_objects.messagelist) {
- this.message_list = new rcube_list_widget(this.gui_objects.messagelist,
- {multiselect:true, multiexpand:true, draggable:true, keyboard:true, dblclick_time:this.dblclick_time});
+ this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {
+ multiselect:true, multiexpand:true, draggable:true, keyboard:true,
+ column_movable:this.env.col_movable, column_fixed:0, dblclick_time:this.dblclick_time
+ });
this.message_list.row_init = function(o){ p.init_message_row(o); };
this.message_list.addEventListener('dblclick', function(o){ p.msglist_dbl_click(o); });
this.message_list.addEventListener('click', function(o){ p.msglist_click(o); });
@@ -176,17 +177,16 @@
this.message_list.addEventListener('dragmove', function(e){ p.drag_move(e); });
this.message_list.addEventListener('dragend', function(e){ p.drag_end(e); });
this.message_list.addEventListener('expandcollapse', function(e){ p.msglist_expand(e); });
+ this.message_list.addEventListener('column_replace', function(e){ p.msglist_set_coltypes(e); });
document.onmouseup = function(e){ return p.doc_mouse_up(e); };
this.gui_objects.messagelist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };
- this.set_message_coltypes(this.env.coltypes);
this.message_list.init();
this.enable_command('toggle_status', 'toggle_flag', 'menu-open', 'menu-save', true);
// load messages
- if (this.env.messagecount)
- this.command('list');
+ this.command('list');
}
if (this.gui_objects.qsearchbox) {
@@ -245,16 +245,6 @@
// show printing dialog
else if (this.env.action == 'print')
window.print();
-
- if (this.env.messagecount) {
- this.enable_command('select-all', 'select-none', 'expunge', true);
- this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading);
- }
-
- if (this.purge_mailbox_test())
- this.enable_command('purge', true);
-
- this.set_page_buttons();
// get unread count for each mailbox
if (this.gui_objects.mailboxlist) {
@@ -370,6 +360,11 @@
// detect client timezone
$('#rcmlogintz').val(new Date().getTimezoneOffset() / -60);
+ // display 'loading' message on form submit
+ $('form').submit(function () {
+ rcmail.display_message(rcmail.get_label('loading'), 'loading', true);
+ });
+
this.enable_command('login', true);
break;
@@ -393,7 +388,7 @@
// execute all foreign onload scripts
// @deprecated
- for (var i=0; i<this.onloads.length; i++) {
+ for (var i in this.onloads) {
if (typeof(this.onloads[i]) == 'string')
eval(this.onloads[i]);
else if (typeof(this.onloads[i]) == 'function')
@@ -512,7 +507,7 @@
case 'listgroup':
- this.list_contacts(null, props);
+ this.list_contacts(props.source, props.id);
break;
@@ -738,6 +733,7 @@
break;
case 'select-none':
+ this.select_all_mode = false;
this.message_list.clear_selection();
break;
@@ -807,12 +803,12 @@
// use contact_id passed as command parameter
var a_cids = [];
if (props)
- a_cids[a_cids.length] = props;
+ a_cids.push(props);
// get selected contacts
else if (this.contact_list) {
var selection = this.contact_list.get_selection();
for (var n=0; n<selection.length; n++)
- a_cids[a_cids.length] = selection[n];
+ a_cids.push(selection[n]);
}
if (a_cids.length)
@@ -1056,13 +1052,13 @@
// set command enabled or disabled
this.enable_command = function()
{
- var args = arguments;
- if (!args.length)
+ var args = arguments, len = args.length;
+ if (!len)
return -1;
- var command, enable = args[args.length-1];
+ var command, enable = args[len-1];
- for (var n=0; n<args.length-1; n++) {
+ for (var n=0, len=len-1; n<len; n++) {
command = args[n];
this.commands[command] = enable;
this.set_button(command, (enable ? 'act' : 'pas'));
@@ -1075,7 +1071,7 @@
{
if (a && message) {
var msg = this.get_label(message);
- if (msg==message)
+ if (msg == message)
msg = 'Loading...';
this.display_message(msg, 'loading', true);
@@ -1262,31 +1258,33 @@
// over the folders
for (var k in this.env.folder_coords) {
pos = this.env.folder_coords[k];
- if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2
- && this.check_droptarget(k)) {
+ if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2){
+ if (this.check_droptarget(k)) {
+ li = this.get_folder_li(k);
+ div = $(li.getElementsByTagName('div')[0]);
- li = this.get_folder_li(k);
- div = $(li.getElementsByTagName('div')[0]);
+ // if the folder is collapsed, expand it after 1sec and restart the drag & drop process.
+ if (div.hasClass('collapsed')) {
+ if (this.folder_auto_timer)
+ window.clearTimeout(this.folder_auto_timer);
- // if the folder is collapsed, expand it after 1sec and restart the drag & drop process.
- if (div.hasClass('collapsed')) {
- if (this.folder_auto_timer)
+ this.folder_auto_expand = k;
+ this.folder_auto_timer = window.setTimeout(function() {
+ rcmail.command('collapse-folder', rcmail.folder_auto_expand);
+ rcmail.drag_start(null);
+ }, 1000);
+ } else if (this.folder_auto_timer) {
window.clearTimeout(this.folder_auto_timer);
+ this.folder_auto_timer = null;
+ this.folder_auto_expand = null;
+ }
- this.folder_auto_expand = k;
- this.folder_auto_timer = window.setTimeout(function() {
- rcmail.command('collapse-folder', rcmail.folder_auto_expand);
- rcmail.drag_start(null);
- }, 1000);
- } else if (this.folder_auto_timer) {
- window.clearTimeout(this.folder_auto_timer);
- this.folder_auto_timer = null;
- this.folder_auto_expand = null;
+ $(li).addClass('droptarget');
+ this.env.folder_coords[k].on = 1;
+ this.env.last_folder_target = k;
+ } else { // Clear target, otherwise drag end will trigger move into last valid droptarget
+ this.env.last_folder_target = null;
}
-
- $(li).addClass('droptarget');
- this.env.last_folder_target = k;
- this.env.folder_coords[k].on = 1;
}
else if (pos.on) {
$(this.get_folder_li(k)).removeClass('droptarget');
@@ -1403,15 +1401,13 @@
var selected = list.get_single_selection() != null;
// Hide certain command buttons when Drafts folder is selected
- if (this.env.mailbox == this.env.drafts_mailbox) {
- this.enable_command('reply', 'reply-all', 'forward', false);
- this.enable_command('show', 'print', 'open', 'edit', 'download', 'viewsource', selected);
- this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
- }
- else {
- this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', 'edit', 'open', 'download', 'viewsource', selected);
- this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
- }
+ this.enable_command('reply', 'reply-all', 'forward', this.env.mailbox == this.env.drafts_mailbox ? false : selected);
+ this.enable_command('show', 'print', 'open', 'edit', 'download', 'viewsource', selected);
+ this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
+
+ // reset all-pages-selection
+ if (selected || (list.selection.length && list.selection.length != list.rowcount))
+ this.select_all_mode = false;
// start timer for message preview (wait for double click)
if (selected && this.env.contentframe && !list.multi_selecting)
@@ -1482,6 +1478,24 @@
if (this.env.messages[row.uid])
this.env.messages[row.uid].expanded = row.expanded;
};
+
+ this.msglist_set_coltypes = function(list)
+ {
+ var i, found, name, cols = list.list.tHead.rows[0].cells;
+
+ this.env.coltypes = [];
+
+ for (i=0; i<cols.length; i++)
+ if (cols[i].id && cols[i].id.match(/^rcm/)) {
+ name = cols[i].id.replace(/^rcm/, '');
+ this.env.coltypes.push(name == 'to' ? 'from' : name);
+ }
+
+ if ((found = $.inArray('flag', this.env.coltypes)) >= 0)
+ this.set_env('flagged_col', found);
+
+ this.http_post('save-pref', { '_name':'list_cols', '_value':this.env.coltypes });
+ };
this.check_droptarget = function(id)
{
@@ -1490,6 +1504,8 @@
else if (this.task == 'addressbook')
return (id != this.env.source && this.env.contactfolders[id] && !this.env.contactfolders[id].readonly &&
!(!this.env.source && this.env.contactfolders[id].group) &&
+ !(this.env.contactfolders[id].type == 'group' && this.env.contactfolders[this.env.source].readonly) &&
+ !(this.env.contactfolders[id].type == 'group' && this.env.contactfolders[id].source != this.env.source) &&
!(this.env.contactfolders[id].type == 'group' && this.env.contactfolders[id].id == this.env.group));
else if (this.task == 'settings')
return (id != this.env.folder);
@@ -1502,7 +1518,7 @@
this.init_message_row = function(row)
{
- var self = this, uid = row.uid;
+ var expando, self = this, uid = row.uid;
if (uid && this.env.messages[uid])
$.extend(row, this.env.messages[uid]);
@@ -1519,8 +1535,8 @@
row.flagged_icon.onmousedown = function(e) { self.command('toggle_flag', this); };
}
- var expando;
if (!row.depth && row.has_children && (expando = document.getElementById('rcmexpando'+row.uid))) {
+ row.expando = expando;
expando.onmousedown = function(e) { return self.expand_message_row(e, uid); };
}
@@ -1532,11 +1548,6 @@
{
if (!this.gui_objects.messagelist || !this.message_list)
return false;
-
- if (this.message_list.background)
- var tbody = this.message_list.background;
- else
- var tbody = this.gui_objects.messagelist.tBodies[0];
if (!this.env.messages[uid])
this.env.messages[uid] = {};
@@ -1550,12 +1561,15 @@
flagged: flags.flagged?1:0,
has_children: flags.has_children?1:0,
depth: flags.depth?flags.depth:0,
- unread_children: flags.unread_children,
- parent_uid: flags.parent_uid
+ unread_children: flags.unread_children?flags.unread_children:0,
+ parent_uid: flags.parent_uid?flags.parent_uid:0,
+ selected: this.select_all_mode || this.message_list.in_selection(uid)
});
- var tree = expando = '',
- rows = this.message_list.rows,
+ var c, tree = expando = '',
+ list = this.message_list,
+ rows = list.rows,
+ tbody = this.gui_objects.messagelist.tBodies[0],
rowcount = tbody.rows.length,
even = rowcount%2,
message = this.env.messages[uid],
@@ -1565,7 +1579,7 @@
+ (flags.deleted ? ' deleted' : '')
+ (flags.flagged ? ' flagged' : '')
+ (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '')
- + (this.message_list.in_selection(uid) ? ' selected' : ''),
+ + (message.selected ? ' selected' : ''),
// for performance use DOM instead of jQuery here
row = document.createElement('tr'),
col = document.createElement('td');
@@ -1590,19 +1604,25 @@
else if(flags.unread && this.env.unreadicon)
icon = this.env.unreadicon;
+ // update selection
+ if (message.selected && !list.in_selection(uid))
+ list.selection.push(uid);
+
// threads
if (this.env.threading) {
// This assumes that div width is hardcoded to 15px,
var width = message.depth * 15;
if (message.depth) {
- if ((this.env.autoexpand_threads == 0 || this.env.autoexpand_threads == 2) &&
- (!rows[message.parent_uid] || !rows[message.parent_uid].expanded)) {
+ if ((rows[message.parent_uid] && rows[message.parent_uid].expanded === false)
+ || ((this.env.autoexpand_threads == 0 || this.env.autoexpand_threads == 2) &&
+ (!rows[message.parent_uid] || !rows[message.parent_uid].expanded))
+ ) {
row.style.display = 'none';
message.expanded = false;
}
else
message.expanded = true;
- }
+ }
else if (message.has_children) {
if (typeof(message.expanded) == 'undefined' && (this.env.autoexpand_threads == 1 || (this.env.autoexpand_threads == 2 && message.unread_children))) {
message.expanded = true;
@@ -1632,21 +1652,21 @@
}
// add each submitted col
- for (var n = 0; n < this.env.coltypes.length; n++) {
- var c = this.env.coltypes[n];
+ for (var n in this.env.coltypes) {
+ c = this.env.coltypes[n];
col = document.createElement('td');
col.className = String(c).toLowerCase();
var html;
- if (c=='flag') {
+ if (c == 'flag') {
if (flags.flagged && this.env.flaggedicon)
html = '<img id="flaggedicn'+uid+'" src="'+this.env.flaggedicon+'" class="flagicon" alt="" />';
else if(!flags.flagged && this.env.unflaggedicon)
html = '<img id="flaggedicn'+uid+'" src="'+this.env.unflaggedicon+'" class="flagicon" alt="" />';
}
- else if (c=='attachment')
+ else if (c == 'attachment')
html = flags.attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : ' ';
- else if (c=='subject')
+ else if (c == 'subject')
html = tree + cols[c];
else
html = cols[c];
@@ -1656,21 +1676,14 @@
row.appendChild(col);
}
- this.message_list.insert_row(row, attop);
+ list.insert_row(row, attop);
// remove 'old' row
- if (attop && this.env.pagesize && this.message_list.rowcount > this.env.pagesize) {
- var uid = this.message_list.get_last_row();
- this.message_list.remove_row(uid);
- this.message_list.clear_selection(uid);
+ if (attop && this.env.pagesize && list.rowcount > this.env.pagesize) {
+ var uid = list.get_last_row();
+ list.remove_row(uid);
+ list.clear_selection(uid);
}
- };
-
- // messages list handling in background (for performance)
- this.offline_message_list = function(flag)
- {
- if (this.message_list)
- this.message_list.set_background_mode(flag);
};
this.set_list_sorting = function(sort_col, sort_order)
@@ -1688,6 +1701,11 @@
{
var update, add_url = '';
+ if (sort_col === null)
+ sort_col = this.env.sort_col;
+ if (!sort_order)
+ sort_order = this.env.sort_order;
+
if (this.env.sort_col != sort_col || this.env.sort_order != sort_order) {
update = 1;
this.set_list_sorting(sort_col, sort_order);
@@ -1695,12 +1713,28 @@
if (this.env.threading != threads) {
update = 1;
- add_url += '&_threads=' + threads;
+ add_url += '&_threads=' + threads;
}
- if (cols.join() != this.env.coltypes.join()) {
- update = 1;
- add_url += '&_cols=' + cols.join(',');
+ if (cols && cols.length) {
+ // make sure new columns are added at the end of the list
+ var i, idx, name, newcols = [], oldcols = this.env.coltypes;
+ for (i=0; i<oldcols.length; i++) {
+ name = oldcols[i] == 'to' ? 'from' : oldcols[i];
+ idx = $.inArray(name, cols);
+ if (idx != -1) {
+ newcols[newcols.length] = name;
+ delete cols[idx];
+ }
+ }
+ for (i=0; i<cols.length; i++)
+ if (cols[i])
+ newcols[newcols.length] = cols[i];
+
+ if (newcols.join() != this.env.coltypes.join()) {
+ update = 1;
+ add_url += '&_cols=' + newcols.join(',');
+ }
}
if (update)
@@ -1710,11 +1744,12 @@
// when user doble-clicks on a row
this.show_message = function(id, safe, preview)
{
- if (!id) return;
+ if (!id)
+ return;
- var add_url = '';
- var action = preview ? 'preview': 'show';
- var target = window;
+ var add_url = '',
+ target = window,
+ action = preview ? 'preview': 'show';
if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
target = window.frames[this.env.contentframe];
@@ -1770,21 +1805,21 @@
// list a specific page
this.list_page = function(page)
{
- if (page=='next')
+ if (page == 'next')
page = this.env.current_page+1;
- if (page=='last')
+ if (page == 'last')
page = this.env.pagecount;
- if (page=='prev' && this.env.current_page>1)
+ if (page == 'prev' && this.env.current_page > 1)
page = this.env.current_page-1;
- if (page=='first' && this.env.current_page>1)
+ if (page == 'first' && this.env.current_page > 1)
page = 1;
if (page > 0 && page <= this.env.pagecount) {
this.env.current_page = page;
- if (this.task=='mail')
+ if (this.task == 'mail')
this.list_mailbox(this.env.mailbox, page);
- else if (this.task=='addressbook')
+ else if (this.task == 'addressbook')
this.list_contacts(this.env.source, null, page);
}
};
@@ -1809,8 +1844,7 @@
// list messages of a specific mailbox
this.list_mailbox = function(mbox, page, sort, add_url)
{
- var url = '';
- var target = window;
+ var url = '', target = window;
if (!mbox)
mbox = this.env.mailbox;
@@ -1827,9 +1861,10 @@
url += '&_search='+this.env.search_request;
// set page=1 if changeing to another mailbox
- if (!page && this.env.mailbox != mbox) {
+ if (this.env.mailbox != mbox) {
page = 1;
this.env.current_page = page;
+ this.select_all_mode = false;
this.show_contentframe(false);
}
@@ -1840,7 +1875,6 @@
this.last_selected = 0;
if (this.message_list) {
this.message_list.clear_selection();
- this.select_all_mode = false;
}
this.select_folder(mbox, this.env.mailbox);
this.env.mailbox = mbox;
@@ -1875,28 +1909,38 @@
this.http_request('list', url+add_url, true);
};
+ // removes messages that doesn't exists from list selection array
+ this.update_selection = function()
+ {
+ var selected = this.message_list.selection,
+ rows = this.message_list.rows,
+ i, selection = [];
+
+ for (i in selected)
+ if (rows[selected[i]])
+ selection.push(selected[i]);
+
+ this.message_list.selection = selection;
+ }
+
// expand all threads with unread children
this.expand_unread = function()
{
- var tbody = this.gui_objects.messagelist.tBodies[0];
- var new_row = tbody.firstChild;
- var r;
+ var r, tbody = this.gui_objects.messagelist.tBodies[0],
+ new_row = tbody.firstChild;
while (new_row) {
if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid])
&& r.unread_children) {
this.message_list.expand_all(r);
- var expando = document.getElementById('rcmexpando' + r.uid);
- if (expando)
- expando.className = 'expanded';
- this.set_unread_children(r.uid);
+ this.set_unread_children(r.uid);
}
new_row = new_row.nextSibling;
}
return false;
};
- // thread expanding/collapsing handler
+ // thread expanding/collapsing handler
this.expand_message_row = function(e, uid)
{
var row = this.message_list.rows[uid];
@@ -1911,7 +1955,7 @@
// message list expanding
this.expand_threads = function()
- {
+ {
if (!this.env.threading || !this.env.autoexpand_threads || !this.message_list)
return;
@@ -1919,7 +1963,99 @@
case 2: this.expand_unread(); break;
case 1: this.message_list.expand_all(); break;
}
- // this.message_list.expand(null);
+ };
+
+ // Initializes threads indicators/expanders after list update
+ this.init_threads = function(roots)
+ {
+ for (var n=0, len=roots.length; n<len; n++)
+ setTimeout(function() { rcmail.add_tree_icons(roots[n]);}, 1);
+ setTimeout(function() { rcmail.expand_threads();}, 1);
+ };
+
+ // adds threads tree icons to the list (or specified thread)
+ this.add_tree_icons = function(root)
+ {
+ var i, l, r, n, len, pos, tmp = [], uid = [],
+ row, rows = this.message_list.rows;
+
+ if (root)
+ row = rows[root] ? rows[root].obj : null;
+ else
+ row = this.message_list.list.tBodies[0].firstChild;
+
+ while (row) {
+ if (row.nodeType == 1 && (r = rows[row.uid])) {
+ if (r.depth) {
+ for (i=tmp.length-1; i>=0; i--) {
+ len = tmp[i].length;
+ if (len > r.depth) {
+ pos = len - r.depth;
+ if (!(tmp[i][pos] & 2))
+ tmp[i][pos] = tmp[i][pos] ? tmp[i][pos]+2 : 2;
+ }
+ else if (len == r.depth) {
+ if (!(tmp[i][0] & 2))
+ tmp[i][0] += 2;
+ }
+ if (r.depth > len)
+ break;
+ }
+
+ tmp.push(new Array(r.depth));
+ tmp[tmp.length-1][0] = 1;
+ uid.push(r.uid);
+ }
+ else {
+ if (tmp.length) {
+ for (i in tmp) {
+ this.set_tree_icons(uid[i], tmp[i]);
+ }
+ tmp = [];
+ uid = [];
+ }
+ if (root && row != rows[root].obj)
+ break;
+ }
+ }
+ row = row.nextSibling;
+ }
+
+ if (tmp.length) {
+ for (i in tmp) {
+ this.set_tree_icons(uid[i], tmp[i]);
+ }
+ }
+ };
+
+ // adds tree icons to specified message row
+ this.set_tree_icons = function(uid, tree)
+ {
+ var i, divs = [], html = '', len = tree.length;
+
+ for (i=0; i<len; i++) {
+ if (tree[i] > 2)
+ divs.push({'class': 'l3', width: 15});
+ else if (tree[i] > 1)
+ divs.push({'class': 'l2', width: 15});
+ else if (tree[i] > 0)
+ divs.push({'class': 'l1', width: 15});
+ // separator div
+ else if (divs.length && !divs[divs.length-1]['class'])
+ divs[divs.length-1].width += 15;
+ else
+ divs.push({'class': null, width: 15});
+ }
+
+ for (i=divs.length-1; i>=0; i--) {
+ if (divs[i]['class'])
+ html += '<div class="tree '+divs[i]['class']+'" />';
+ else
+ html += '<div style="width:'+divs[i].width+'px" />';
+ }
+
+ if (html)
+ $('#rcmtab'+uid).html(html);
};
// update parent in a thread
@@ -1937,10 +2073,12 @@
if (flag == 'read' && p.unread_children) {
p.unread_children--;
- } else if (flag == 'unread' && p.has_children) {
+ }
+ else if (flag == 'unread' && p.has_children) {
// unread_children may be undefined
p.unread_children = p.unread_children ? p.unread_children + 1 : 1;
- } else {
+ }
+ else {
return;
}
@@ -1955,17 +2093,17 @@
if (!this.env.threading)
return 0;
- var rows = this.message_list.rows;
- var row = rows[uid]
- var depth = rows[uid].depth;
- var r, parent, count = 0;
- var roots = [];
+ var r, parent, count = 0,
+ rows = this.message_list.rows,
+ row = rows[uid],
+ depth = rows[uid].depth,
+ roots = [];
if (!row.depth) // root message: decrease roots count
count--;
else if (row.unread) {
// update unread_children for thread root
- var parent = this.message_list.find_root(uid);
+ parent = this.message_list.find_root(uid);
rows[parent].unread_children--;
this.set_unread_children(parent);
}
@@ -1980,7 +2118,8 @@
break;
r.depth--; // move left
- $('#rcmtab'+r.uid).width(r.depth * 15);
+ // reset width and clear the content of a tab, icons will be added later
+ $('#rcmtab'+r.uid).width(r.depth * 15).html('');
if (!r.depth) { // a new root
count++; // increase roots count
r.parent_uid = 0;
@@ -1993,7 +2132,7 @@
function(e) { return e.data.p.expand_message_row(e, e.data.uid); });
r.unread_children = 0;
- roots[roots.length] = r;
+ roots.push(r);
}
// show if it was hidden
if (r.obj.style.display == 'none')
@@ -2018,10 +2157,10 @@
this.delete_excessive_thread_rows = function()
{
- var rows = this.message_list.rows;
- var tbody = this.message_list.list.tBodies[0];
- var row = tbody.firstChild;
- var cnt = this.env.pagesize + 1;
+ var rows = this.message_list.rows,
+ tbody = this.message_list.list.tBodies[0],
+ row = tbody.firstChild,
+ cnt = this.env.pagesize + 1;
while (row) {
if (row.nodeType == 1 && (r = rows[row.uid])) {
@@ -2038,8 +2177,8 @@
// set message icon
this.set_message_icon = function(uid)
{
- var icn_src;
- var rows = this.message_list.rows;
+ var icn_src,
+ rows = this.message_list.rows;
if (!rows[uid])
return false;
@@ -2131,7 +2270,7 @@
{
var row = this.message_list.rows[uid];
- if (row.parent_uid || !row.has_children)
+ if (row.parent_uid)
return;
if (!row.unread && row.unread_children && !row.expanded)
@@ -2143,21 +2282,22 @@
// copy selected messages to the specified mailbox
this.copy_messages = function(mbox)
{
+ if (mbox && typeof mbox == 'object')
+ mbox = mbox.id;
+
// exit if current or no mailbox specified or if selection is empty
if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
return;
- var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
- var a_uids = [];
+ var a_uids = [],
+ add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
if (this.env.uid)
a_uids[0] = this.env.uid;
else {
var selection = this.message_list.get_selection();
- var id;
- for (var n=0; n<selection.length; n++) {
- id = selection[n];
- a_uids[a_uids.length] = id;
+ for (var n in selection) {
+ a_uids.push(selection[n]);
}
}
@@ -2202,7 +2342,7 @@
return;
// also select childs of collapsed rows
- for (var uid, i=0; i < selection.length; i++) {
+ for (var uid, i=0, len=selection.length; i<len; i++) {
uid = selection[i];
if (this.message_list.rows[uid].has_children && !this.message_list.rows[uid].expanded)
this.message_list.select_childs(uid);
@@ -2250,21 +2390,33 @@
if (this.env.uid)
a_uids[0] = this.env.uid;
else {
- var selection = this.message_list.get_selection();
- var id;
- for (var n=0; n<selection.length; n++) {
+ var n, id, root, roots = [],
+ selection = this.message_list.get_selection();
+
+ for (n=0, len=selection.length; n<len; n++) {
id = selection[n];
- a_uids[a_uids.length] = id;
- count += this.update_thread(id);
+ a_uids.push(id);
+
+ if (this.env.threading) {
+ count += this.update_thread(id);
+ root = this.message_list.find_root(id);
+ if (root != id && $.inArray(root, roots) < 0) {
+ roots.push(root);
+ }
+ }
this.message_list.remove_row(id, (this.env.display_next && n == selection.length-1));
}
// make sure there are no selected rows
if (!this.env.display_next)
this.message_list.clear_selection();
+ // update thread tree icons
+ for (n=0, len=roots.length; n<len; n++) {
+ this.add_tree_icons(roots[n]);
+ }
}
// also send search request to get the right messages
- if (this.env.search_request)
+ if (this.env.search_request)
add_url += '&_search='+this.env.search_request;
if (this.env.display_next && this.env.next_uid)
@@ -2285,7 +2437,7 @@
// set a specific flag to one or more messages
this.mark_message = function(flag, uid)
{
- var a_uids = [], r_uids = [],
+ var a_uids = [], r_uids = [], len, n, id,
selection = this.message_list ? this.message_list.get_selection() : [];
if (uid)
@@ -2293,15 +2445,15 @@
else if (this.env.uid)
a_uids[0] = this.env.uid;
else if (this.message_list) {
- for (var n=0; n<selection.length; n++) {
- a_uids[a_uids.length] = selection[n];
+ for (n=0, len=selection.length; n<len; n++) {
+ a_uids.push(selection[n]);
}
}
if (!this.message_list)
r_uids = a_uids;
else
- for (var id, n=0; n<a_uids.length; n++) {
+ for (n=0, len=a_uids.length; n<len; n++) {
id = a_uids[n];
if ((flag=='read' && this.message_list.rows[id].unread)
|| (flag=='unread' && !this.message_list.rows[id].unread)
@@ -2310,7 +2462,7 @@
|| (flag=='flagged' && !this.message_list.rows[id].flagged)
|| (flag=='unflagged' && this.message_list.rows[id].flagged))
{
- r_uids[r_uids.length] = id;
+ r_uids.push(id);
}
}
@@ -2341,7 +2493,13 @@
for (var i=0; i<a_uids.length; i++)
this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));
- this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag);
+ var url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag;
+
+ // also send search request to get the right messages
+ if (this.env.search_request)
+ url += '&_search='+this.env.search_request;
+
+ this.http_post('mark', url);
for (var i=0; i<a_uids.length; i++)
this.update_thread_root(a_uids[i], flag);
@@ -2354,7 +2512,13 @@
for (var i=0; i<a_uids.length; i++)
this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));
- this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag);
+ var url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag;
+
+ // also send search request to get the right messages
+ if (this.env.search_request)
+ url += '&_search='+this.env.search_request;
+
+ this.http_post('mark', url);
};
// mark all message rows as deleted/undeleted
@@ -2371,8 +2535,8 @@
return true;
}
- var all_deleted = true;
- for (var uid, i=0; i<a_uids.length; i++) {
+ var uid, all_deleted = true;
+ for (var i=0, len=a_uids.length; i<len; i++) {
uid = a_uids[i];
if (rows[uid] && !rows[uid].deleted) {
all_deleted = false;
@@ -2390,10 +2554,16 @@
this.flag_as_undeleted = function(a_uids)
{
- for (var i=0; i<a_uids.length; i++)
+ for (var i=0, len=a_uids.length; i<len; i++)
this.set_message(a_uids[i], 'deleted', false);
- this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete');
+ var url = '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete';
+
+ // also send search request to get the right messages
+ if (this.env.search_request)
+ url += '&_search='+this.env.search_request;
+
+ this.http_post('mark', url);
return true;
};
@@ -2404,7 +2574,7 @@
rows = this.message_list ? this.message_list.rows : [],
count = 0;
- for (var i=0; i<a_uids.length; i++) {
+ for (var i=0, len=a_uids.length; i<len; i++) {
uid = a_uids[i];
if (rows[uid]) {
if (rows[uid].unread)
@@ -2437,12 +2607,13 @@
add_url += '&_ruid='+this.uids_to_list(r_uids);
if (this.env.skip_deleted) {
- // also send search request to get the right messages
- if (this.env.search_request)
- add_url += '&_search='+this.env.search_request;
if (this.env.display_next && this.env.next_uid)
add_url += '&_next_uid='+this.env.next_uid;
}
+
+ // also send search request to get the right messages
+ if (this.env.search_request)
+ add_url += '&_search='+this.env.search_request;
this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=delete'+add_url);
return true;
@@ -2566,20 +2737,22 @@
this.init_address_input_events($("[name='_bcc']"));
if (!html_mode) {
+ this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
// add signature according to selected identity
// if we have HTML editor, signature is added in callback
if (input_from.attr('type') == 'select-one' && $("input[name='_draft_saveid']").val() == '') {
this.change_identity(input_from[0]);
}
- this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
}
if (input_to.val() == '')
input_to.focus();
else if (input_subject.val() == '')
input_subject.focus();
- else if (input_message && !html_mode)
+ else if (input_message)
input_message.focus();
+
+ this.env.compose_focus_elem = document.activeElement;
// get summary of all field values
this.compose_field_hash(true);
@@ -2746,15 +2919,13 @@
if (!show_sig)
show_sig = this.env.show_sig;
- var id = obj.options[obj.selectedIndex].value;
- var input_message = $("[name='_message']");
- var message = input_message.val();
- var is_html = ($("input[name='_is_html']").val() == '1');
- var sig_separator = this.env.sig_above && (this.env.compose_mode == 'reply' || this.env.compose_mode == 'forward') ? '---' : '-- ';
- var sig, cursor_pos, p = -1;
-
- if (!this.env.identity)
- this.env.identity = id
+ var cursor_pos, p = -1,
+ id = obj.options[obj.selectedIndex].value,
+ input_message = $("[name='_message']"),
+ message = input_message.val(),
+ is_html = ($("input[name='_is_html']").val() == '1'),
+ sig = this.env.identity,
+ sig_separator = this.env.sig_above && (this.env.compose_mode == 'reply' || this.env.compose_mode == 'forward') ? '---' : '-- ';
// enable manual signature insert
if (this.env.signatures && this.env.signatures[id])
@@ -2764,9 +2935,10 @@
if (!is_html) {
// remove the 'old' signature
- if (show_sig && this.env.identity && this.env.signatures && this.env.signatures[this.env.identity]) {
- sig = this.env.signatures[this.env.identity].is_html ? this.env.signatures[this.env.identity].plain_text : this.env.signatures[this.env.identity].text;
- sig = sig.replace(/\r\n/, '\n');
+ if (show_sig && sig && this.env.signatures && this.env.signatures[sig]) {
+
+ sig = this.env.signatures[sig].is_html ? this.env.signatures[sig].plain_text : this.env.signatures[sig].text;
+ sig = sig.replace(/\r\n/g, '\n');
if (!sig.match(/^--[ -]\n/))
sig = sig_separator + '\n' + sig;
@@ -2778,7 +2950,7 @@
// add the new signature string
if (show_sig && this.env.signatures && this.env.signatures[id]) {
sig = this.env.signatures[id]['is_html'] ? this.env.signatures[id]['plain_text'] : this.env.signatures[id]['text'];
- sig = sig.replace(/\r\n/, '\n');
+ sig = sig.replace(/\r\n/g, '\n');
if (!sig.match(/^--[ -]\n/))
sig = sig_separator + '\n' + sig;
@@ -2787,7 +2959,7 @@
if (p >= 0) { // in place of removed signature
message = message.substring(0, p) + sig + message.substring(p, message.length);
cursor_pos = p - 1;
- }
+ }
else if (pos = this.get_caret_pos(input_message.get(0))) { // at cursor position
message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
cursor_pos = pos;
@@ -2795,7 +2967,7 @@
else { // on top
cursor_pos = 0;
message = '\n\n' + sig + '\n\n' + message.replace(/^[\r\n]+/, '');
- }
+ }
}
else {
message = message.replace(/[\r\n]+$/, '');
@@ -2812,20 +2984,20 @@
this.set_caret_pos(input_message.get(0), cursor_pos);
}
else if (show_sig && this.env.signatures) { // html
- var editor = tinyMCE.get(this.env.composebody);
- var sigElem = editor.dom.get('_rc_sig');
+ var editor = tinyMCE.get(this.env.composebody),
+ sigElem = editor.dom.get('_rc_sig');
// Append the signature as a div within the body
if (!sigElem) {
- var body = editor.getBody();
- var doc = editor.getDoc();
+ var body = editor.getBody(),
+ doc = editor.getDoc();
sigElem = doc.createElement('div');
sigElem.setAttribute('id', '_rc_sig');
if (this.env.sig_above) {
// if no existing sig and top posting then insert at caret pos
- editor.getWin().focus(); // correct focus in IE
+ editor.getWin().focus(); // correct focus in IE & Chrome
var node = editor.selection.getNode();
if (node.nodeName == 'BODY') {
@@ -3358,10 +3530,7 @@
var add_url = '';
var target = window;
- // currently all groups belong to the local address book
- if (group)
- src = 0;
- else if (!src)
+ if (!src)
src = this.env.source;
if (page && this.current_page == page && src == this.env.source && group == this.env.group)
@@ -3375,7 +3544,7 @@
else if (group != this.env.group)
page = this.env.current_page = 1;
- this.select_folder((group ? 'G'+group : src), (this.env.group ? 'G'+this.env.group : this.env.source));
+ this.select_folder((group ? 'G'+src+group : src), (this.env.group ? 'G'+this.env.source+this.env.group : this.env.source));
this.env.source = src;
this.env.group = group;
@@ -3431,8 +3600,8 @@
// load contact record
this.load_contact = function(cid, action, framed)
{
- var add_url = '';
- var target = window;
+ var add_url = '', target = window;
+
if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
add_url = '&_framed=1';
target = window.frames[this.env.contentframe];
@@ -3442,8 +3611,11 @@
return false;
if (action && (cid || action=='add') && !this.drag_active) {
+ if (this.env.group)
+ add_url += '&_gid='+urlencode(this.env.group);
+
this.set_busy(true);
- target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+'&_cid='+urlencode(cid) + add_url;
+ target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_cid='+urlencode(cid) + add_url;
}
return true;
};
@@ -3457,7 +3629,7 @@
if (to.type == 'group')
this.http_post('group-addmembers', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(to.id));
else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly)
- this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to.id));
+ this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to.id)+(this.env.group ? '&_gid='+urlencode(this.env.group) : ''));
};
@@ -3468,15 +3640,14 @@
if (!(selection.length || this.env.cid) || (!this.env.group && !confirm(this.get_label('deletecontactconfirm'))))
return;
- var a_cids = [], qs = '';
+ var id, a_cids = [], qs = '';
if (this.env.cid)
- a_cids[a_cids.length] = this.env.cid;
+ a_cids.push(this.env.cid);
else {
- var id;
for (var n=0; n<selection.length; n++) {
id = selection[n];
- a_cids[a_cids.length] = id;
+ a_cids.push(id);
this.contact_list.remove_row(id, (n == selection.length-1));
}
@@ -3563,7 +3734,8 @@
this.name_input.type = 'text';
this.name_input.onkeypress = function(e){ return rcmail.add_input_keypress(e); };
- this.gui_objects.folderlist.parentNode.appendChild(this.name_input);
+ var li = this.get_folder_li(this.env.source)
+ $(this.name_input).insertAfter(li);
}
this.name_input.select();
@@ -3578,11 +3750,11 @@
this.enable_command('list', 'listgroup', false);
this.name_input = document.createElement('input');
this.name_input.type = 'text';
- this.name_input.value = this.env.contactgroups['G'+this.env.group].name;
+ this.name_input.value = this.env.contactgroups['G'+this.env.source+this.env.group].name;
this.name_input.onkeypress = function(e){ return rcmail.add_input_keypress(e); };
this.env.group_renaming = true;
- var link, li = this.get_folder_li(this.env.group, 'rcmliG');
+ var li = this.get_folder_li(this.env.source+this.env.group, 'rcmliG');
if (li && (link = li.firstChild)) {
$(link).hide();
li.insertBefore(this.name_input, link);
@@ -3599,18 +3771,18 @@
};
// callback from server upon group-delete command
- this.remove_group_item = function(id)
+ this.remove_group_item = function(prop)
{
- var li, key = 'G'+id;
+ var li, key = 'G'+prop.source+prop.id;
if ((li = this.get_folder_li(key))) {
- this.triggerEvent('removegroup', { id:id, li:li });
+ this.triggerEvent('removegroup', { source:prop.source, id:prop.id, li:li });
li.parentNode.removeChild(li);
delete this.env.contactfolders[key];
delete this.env.contactgroups[key];
}
- this.list_contacts(null, 0);
+ this.list_contacts(prop.source, 0);
};
// handler for keyboard events on the input field
@@ -3660,30 +3832,31 @@
this.reset_add_input();
prop.type = 'group';
- var key = 'G'+prop.id;
+ var key = 'G'+prop.source+prop.id;
this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
var link = $('<a>').attr('href', '#')
- .bind('click', function() { return rcmail.command('listgroup', prop.id, this);})
+ .bind('click', function() { return rcmail.command('listgroup', prop, this);})
.html(prop.name);
var li = $('<li>').attr('id', 'rcmli'+key).addClass('contactgroup').append(link);
- $(this.gui_objects.folderlist).append(li);
+ var pli = this.get_folder_li(prop.source)
+ $(li).insertAfter(pli);
- this.triggerEvent('insertgroup', { id:prop.id, name:prop.name, li:li[0] });
+ this.triggerEvent('insertgroup', { id:prop.id, source:prop.source, name:prop.name, li:li[0] });
};
// callback for renaming a contact group
- this.update_contact_group = function(id, name)
+ this.update_contact_group = function(prop)
{
this.reset_add_input();
- var key = 'G'+id, link, li = this.get_folder_li(key);
+ var key = 'G'+prop.source+prop.id, link, li = this.get_folder_li(key);
if (li && (link = li.firstChild) && link.tagName.toLowerCase() == 'a')
- link.innerHTML = name;
+ link.innerHTML = prop.name;
this.env.contactfolders[key].name = this.env.contactgroups[key].name = name;
- this.triggerEvent('updategroup', { id:id, name:name, li:li[0] });
+ this.triggerEvent('updategroup', { id:prop.id, source:prop.source, name:prop.name, li:li[0] });
};
@@ -4131,7 +4304,7 @@
/********* GUI functionality *********/
/*********************************************************/
- // eable/disable buttons for page shifting
+ // enable/disable buttons for page shifting
this.set_page_buttons = function()
{
this.enable_command('nextpage', (this.env.pagecount > this.env.current_page));
@@ -4201,13 +4374,13 @@
// set image according to button state
if (obj && button.type=='image' && button[state]) {
- button.status = state;
+ button.status = state;
obj.src = button[state];
}
// set class name according to button state
else if (obj && typeof(button[state])!='undefined') {
- button.status = state;
- obj.className = button[state];
+ button.status = state;
+ obj.className = button[state];
}
// disable/enable input buttons
if (obj && button.type=='input') {
@@ -4431,13 +4604,15 @@
this.env.flagged_col = null;
var found;
- if((found = $.inArray('subject', this.env.coltypes)) >= 0) {
+ if ((found = $.inArray('subject', this.env.coltypes)) >= 0) {
this.set_env('subject_col', found);
if (this.message_list)
this.message_list.subject_col = found+1;
}
- if((found = $.inArray('flag', this.env.coltypes)) >= 0)
+ if ((found = $.inArray('flag', this.env.coltypes)) >= 0)
this.set_env('flagged_col', found);
+
+ this.message_list.init_header();
};
// replace content of row count display
@@ -4481,6 +4656,7 @@
this.set_unread_count_display = function(mbox, set_title)
{
var reg, text_obj, item, mycount, childcount, div;
+
if (item = this.get_folder_li(mbox)) {
mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
text_obj = item.getElementsByTagName('a')[0];
@@ -4517,8 +4693,8 @@
// set unread count to window title
reg = /^\([0-9]+\)\s+/i;
if (set_title && document.title) {
- var doc_title = String(document.title);
- var new_title = "";
+ var new_title = '',
+ doc_title = String(document.title);
if (mycount && doc_title.match(reg))
new_title = doc_title.replace(reg, '('+mycount+') ');
@@ -4543,16 +4719,16 @@
this.toggle_prefer_html = function(checkbox)
{
- var addrbook_show_images;
- if (addrbook_show_images = document.getElementById('rcmfd_addrbook_show_images'))
- addrbook_show_images.disabled = !checkbox.checked;
+ var elem;
+ if (elem = document.getElementById('rcmfd_addrbook_show_images'))
+ elem.disabled = !checkbox.checked;
};
this.toggle_preview_pane = function(checkbox)
{
- var preview_pane_mark_read;
- if (preview_pane_mark_read = document.getElementById('rcmfd_preview_pane_mark_read'))
- preview_pane_mark_read.disabled = !checkbox.checked;
+ var elem;
+ if (elem = document.getElementById('rcmfd_preview_pane_mark_read'))
+ elem.disabled = !checkbox.checked;
};
// display fetched raw headers
@@ -4602,13 +4778,13 @@
if (!data || !obj)
return false;
- var limit_high = 80;
- var limit_mid = 55;
- var width = data.width ? data.width : this.env.indicator_width ? this.env.indicator_width : 100;
- var height = data.height ? data.height : this.env.indicator_height ? this.env.indicator_height : 14;
- var quota = data.percent ? Math.abs(parseInt(data.percent)) : 0;
- var quota_width = parseInt(quota / 100 * width);
- var pos = $(obj).position();
+ var limit_high = 80,
+ limit_mid = 55,
+ width = data.width ? data.width : this.env.indicator_width ? this.env.indicator_width : 100,
+ height = data.height ? data.height : this.env.indicator_height ? this.env.indicator_height : 14,
+ quota = data.percent ? Math.abs(parseInt(data.percent)) : 0,
+ quota_width = parseInt(quota / 100 * width),
+ pos = $(obj).position();
this.env.indicator_width = width;
this.env.indicator_height = height;
@@ -4648,8 +4824,7 @@
}
// replace quota image
- obj.innerHTML = '';
- $(obj).append(bar1).append(bar2).append(main);
+ $(obj).html('').append(bar1).append(bar2).append(main);
};
/********************************************************/
@@ -4658,11 +4833,11 @@
this.html2plain = function(htmlText, id)
{
- var url = this.env.bin_path+'html2text.php';
- var rcmail = this;
+ var rcmail = this,
+ url = '?_task=utils&_action=html2text';
this.set_busy(true, 'converting');
- console.log('HTTP POST: '+url);
+ console.log('HTTP POST: ' + url);
$.ajax({ type: 'POST', url: url, data: htmlText, contentType: 'application/octet-stream',
error: function(o) { rcmail.http_error(o); },
@@ -4730,8 +4905,6 @@
// handle HTTP response
this.http_response = function(response)
{
- var console_msg = '';
-
if (response.unlock)
this.set_busy(false);
@@ -4772,8 +4945,7 @@
if (this.env.action == 'show') {
// re-enable commands on move/delete error
this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'edit', 'viewsource', 'download', true);
- } else if (this.message_list)
- this.message_list.init();
+ }
break;
case 'purge':
@@ -4795,24 +4967,23 @@
case 'search':
case 'list':
if (this.task == 'mail') {
- if (this.message_list && (response.action == 'list' || response.action == 'search')) {
- this.msglist_select(this.message_list);
- this.expand_threads();
- }
this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
this.enable_command('purge', this.purge_mailbox_test());
-
this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount);
- if (response.action == 'list')
+ if (response.action == 'list' || response.action == 'search') {
+ this.msglist_select(this.message_list);
this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
+ }
}
else if (this.task == 'addressbook') {
this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
- if (response.action == 'list') {
- this.enable_command('group-create', this.env.address_sources[this.env.source].groups);
- this.enable_command('group-rename', 'group-delete', this.env.address_sources[this.env.source].groups && this.env.group);
+ if (response.action == 'list' || response.action == 'search') {
+ this.enable_command('group-create',
+ (this.env.address_sources[this.env.source].groups && !this.env.address_sources[this.env.source].readonly));
+ this.enable_command('group-rename', 'group-delete',
+ (this.env.address_sources[this.env.source].groups && this.env.group && !this.env.address_sources[this.env.source].readonly));
this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
}
}
@@ -4832,33 +5003,38 @@
this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
};
- // use an image to send a keep-alive siganl to the server
- this.send_keep_alive = function()
- {
- var d = new Date();
- this.http_request('keep-alive', '_t='+d.getTime());
- };
-
- // start interval for keep-alive/recent_check signal
+ // starts interval for keep-alive/check-recent signal
this.start_keepalive = function()
{
+ if (this._int)
+ clearInterval(this._int);
+
if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.mailboxlist)
this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
else if (this.env.keep_alive && !this.env.framed && this.task!='login')
this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
};
- // send periodic request to check for recent messages
+ // sends keep-alive signal to the server
+ this.send_keep_alive = function()
+ {
+ var d = new Date();
+ this.http_request('keep-alive', '_t='+d.getTime());
+ };
+
+ // sends request to check for recent messages
this.check_for_recent = function(refresh)
{
if (this.busy)
return;
- var addurl = '_t=' + (new Date().getTime());
+ var addurl = '_t=' + (new Date().getTime()) + '&_mbox=' + urlencode(this.env.mailbox);
if (refresh) {
this.set_busy(true, 'checkingmail');
addurl += '&_refresh=1';
+ // reset check-recent interval
+ this.start_keepalive();
}
if (this.gui_objects.messagelist)
@@ -4935,9 +5111,9 @@
return;
var type;
- for (var n=0; n<form.elements.length; n++) {
+ for (var n=0, len=form.elements.length; n<len; n++) {
type = form.elements[n];
- if (type=='hidden')
+ if (type == 'hidden')
continue;
form.elements[n].disabled = lock;
--
Gitblit v1.9.1