From 41b43ba00e9110e6f415014382e11af7fe381fcb Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 28 Nov 2008 14:01:35 -0500
Subject: [PATCH] Don't set client busy when automatically checking for new messages (#1485276)
---
program/js/app.js | 497 ++++++++++++++++++++++++++----------------------------
1 files changed, 242 insertions(+), 255 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index d1341c7..f301e55 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -64,13 +64,11 @@
this.env[p] = value;
};
-
// add a localized label to the client environment
this.add_label = function(key, value)
{
this.labels[key] = value;
};
-
// add a button to the button list
this.register_button = function(command, id, type, act, sel, over)
@@ -204,6 +202,8 @@
}
if (this.env.drafts_mailbox)
this.enable_command('savedraft', true);
+
+ document.onmouseup = function(e){ return p.doc_mouse_up(e); };
}
if (this.env.messagecount)
@@ -268,7 +268,7 @@
this.set_page_buttons();
- if (this.env.address_sources && !this.env.address_sources[this.env.source].readonly)
+ if (this.env.address_sources && this.env.address_sources[this.env.source] && !this.env.address_sources[this.env.source].readonly)
this.enable_command('add', true);
if (this.env.cid)
@@ -290,8 +290,8 @@
this.enable_command('preferences', 'identities', 'save', 'folders', true);
if (this.env.action=='identities' || this.env.action=='edit-identity' || this.env.action=='add-identity') {
- this.enable_command('add', 'delete', this.env.multiple_identities);
- this.enable_command('edit', true);
+ this.enable_command('add', this.env.identities_level < 2);
+ this.enable_command('delete', 'edit', true);
}
if (this.env.action=='edit-identity' || this.env.action=='add-identity')
@@ -339,7 +339,6 @@
break;
}
-
// enable basic commands
this.enable_command('logout', true);
@@ -353,7 +352,6 @@
// start keep-alive interval
this.start_keepalive();
-
// execute all foreign onload scripts
for (var i=0; i<this.onloads.length; i++)
{
@@ -364,16 +362,14 @@
}
};
-
// start interval for keep-alive/recent_check signal
this.start_keepalive = function()
{
if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.mailboxlist)
- this._int = setInterval(function(){ ref.check_for_recent(); }, this.env.keep_alive * 1000);
+ 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);
+ this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
}
-
this.init_message_row = function(row)
{
@@ -415,7 +411,6 @@
}
};
-
// init message compose form: set focus and eventhandlers
this.init_messageform = function()
{
@@ -430,6 +425,7 @@
var input_replyto = rcube_find_object('_replyto');
var input_subject = rcube_find_object('_subject');
var input_message = rcube_find_object('_message');
+ var draftid = rcube_find_object('_draft_saveid');
// init live search events
if (input_to)
@@ -440,8 +436,12 @@
this.init_address_input_events(input_bcc);
// add signature according to selected identity
- if (input_from && input_from.type=='select-one')
+ if (input_from && input_from.type=='select-one' && (!draftid || draftid.value=='')
+ // if we have HTML editor, signature is added in callback
+ && rcube_find_object('_is_html').value != '1')
+ {
this.change_identity(input_from);
+ }
if (input_to && input_to.value=='')
input_to.focus();
@@ -460,28 +460,19 @@
this.init_address_input_events = function(obj)
{
var handler = function(e){ return ref.ksearch_keypress(e,this); };
- var handler2 = function(e){ return ref.ksearch_blur(e,this); };
if (obj.addEventListener)
- {
obj.addEventListener(bw.safari ? 'keydown' : 'keypress', handler, false);
- obj.addEventListener('blur', handler2, false);
- }
else
- {
obj.onkeydown = handler;
- obj.onblur = handler2;
- }
- obj.setAttribute('autocomplete', 'off');
+ obj.setAttribute('autocomplete', 'off');
};
-
/*********************************************************/
/********* client command interface *********/
/*********************************************************/
-
// execute a specific command on the web client
this.command = function(command, props, obj)
@@ -501,7 +492,6 @@
return false;
}
-
// check input before leaving compose step
if (this.task=='mail' && this.env.action=='compose' && (command=='list' || command=='mail' || command=='addressbook' || command=='settings'))
@@ -570,7 +560,7 @@
var sort_col = a_sort[0];
var sort_order = a_sort[1] ? a_sort[1].toUpperCase() : null;
var header;
-
+
// no sort order specified: toggle
if (sort_order==null)
{
@@ -584,9 +574,9 @@
break;
// set table header class
- if (header = document.getElementById('rcmHead'+this.env.sort_col))
+ if (header = document.getElementById('rcm'+this.env.sort_col))
this.set_classname(header, 'sorted'+(this.env.sort_order.toUpperCase()), false);
- if (header = document.getElementById('rcmHead'+sort_col))
+ if (header = document.getElementById('rcm'+sort_col))
this.set_classname(header, 'sorted'+sort_order, true);
// save new sort properties
@@ -825,28 +815,35 @@
break;
case 'checkmail':
- this.check_for_recent();
+ this.check_for_recent(true);
break;
case 'compose':
var url = this.env.comm_path+'&_action=compose';
- if (this.task=='mail' && this.env.mailbox==this.env.drafts_mailbox)
+ if (this.task=='mail')
+ {
+ url += '&_mbox='+urlencode(this.env.mailbox);
+
+ if (this.env.mailbox==this.env.drafts_mailbox)
{
- var uid;
- if (uid = this.get_single_uid())
- url += '&_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
+ var uid;
+ if (uid = this.get_single_uid())
+ url += '&_draft_uid='+uid;
}
+ else if (props)
+ url += '&_to='+urlencode(props);
+ }
// modify url if we're in addressbook
else if (this.task=='addressbook')
{
// switch to mail compose step directly
if (props && props.indexOf('@') > 0)
- {
+ {
url = this.get_task_url('mail', url);
this.redirect(url + '&_to='+urlencode(props));
break;
- }
+ }
// use contact_id passed as command parameter
var a_cids = new Array();
@@ -865,8 +862,6 @@
break;
}
- else if (props)
- url += '&_to='+urlencode(props);
// don't know if this is necessary...
url = url.replace(/&_framed=1/, "");
@@ -1072,7 +1067,6 @@
return obj ? false : true;
};
-
// set command enabled or disabled
this.enable_command = function()
{
@@ -1090,7 +1084,6 @@
}
return true;
};
-
// lock/unlock interface
this.set_busy = function(a, message)
@@ -1121,7 +1114,6 @@
this.request_timer = window.setTimeout(function(){ ref.request_timed_out(); }, this.env.request_timeout * 1000);
};
-
// return a localized string
this.get_label = function(name)
{
@@ -1130,7 +1122,6 @@
else
return name;
};
-
// switch to another application task
this.switch_task = function(task)
@@ -1145,7 +1136,6 @@
this.redirect(url);
};
-
this.get_task_url = function(task, url)
{
if (!url)
@@ -1154,7 +1144,6 @@
return url.replace(/_task=[a-z]+/, '_task='+task);
};
-
// called when a request timed out
this.request_timed_out = function()
{
@@ -1167,7 +1156,6 @@
/********* event handling methods *********/
/*********************************************************/
-
this.doc_mouse_up = function(e)
{
var model, li;
@@ -1179,6 +1167,9 @@
else if (this.contact_list) {
this.contact_list.blur();
model = this.env.address_sources;
+ }
+ else if (this.ksearch_value) {
+ this.ksearch_blur();
}
// handle mouse release when dragging
@@ -1264,7 +1255,6 @@
return rcube_event.get_button(e) == 2 ? true : rcube_event.cancel(e);
};
-
this.msglist_select = function(list)
{
if (this.preview_timer)
@@ -1292,7 +1282,6 @@
this.show_contentframe(false);
};
-
this.msglist_dbl_click = function(list)
{
if (this.preview_timer)
@@ -1304,7 +1293,6 @@
else if (uid)
this.show_message(uid, false, false);
};
-
this.msglist_keypress = function(list)
{
@@ -1318,7 +1306,6 @@
list.shiftkey = false;
};
-
this.msglist_get_preview = function()
{
var uid = this.get_single_uid();
@@ -1327,7 +1314,6 @@
else if (this.env.contentframe)
this.show_contentframe(false);
};
-
this.check_droptarget = function(id)
{
@@ -1347,9 +1333,12 @@
// when user doble-clicks on a row
this.show_message = function(id, safe, preview)
{
+ if (!id) return;
+
var add_url = '';
var action = preview ? 'preview': 'show';
var target = window;
+
if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe])
{
target = window.frames[this.env.contentframe];
@@ -1362,20 +1351,25 @@
// also send search request to get the right messages
if (this.env.search_request)
add_url += '&_search='+this.env.search_request;
-
- if (id)
+ var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url;
+ if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
+ this.show_contentframe(true);
+ else
{
- var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url;
- if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
- this.show_contentframe(true);
- else
+ this.set_busy(true, 'loading');
+ target.location.href = this.env.comm_path+url;
+ // mark as read and change mbox unread counter
+ if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread)
{
- this.set_busy(true, 'loading');
- target.location.href = this.env.comm_path+url;
- }
+ this.set_message(id, 'unread', false);
+ if (this.env.unread_counts[this.env.mailbox])
+ {
+ this.env.unread_counts[this.env.mailbox] -= 1;
+ this.set_unread_count(this.env.mailbox, this.env.unread_counts[this.env.mailbox], this.env.mailbox == 'INBOX');
+ }
+ }
}
};
-
this.show_contentframe = function(show)
{
@@ -1394,7 +1388,6 @@
if (!show && this.busy)
this.set_busy(false);
};
-
// list a specific page
this.list_page = function(page)
@@ -1418,6 +1411,23 @@
this.list_contacts(this.env.source, page);
}
};
+
+ // list messages of a specific mailbox using filter
+ this.filter_mailbox = function(filter)
+ {
+ var search;
+ if (this.gui_objects.qsearchbox)
+ search = this.gui_objects.qsearchbox.value;
+
+ this.message_list.clear();
+
+ // reset vars
+ this.env.current_page = 1;
+ this.set_busy(true, 'searching');
+ this.http_request('search', '_filter='+filter
+ + (search ? '&_q='+urlencode(search) : '')
+ + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), true);
+ }
// list messages of a specific mailbox
@@ -1475,7 +1485,6 @@
}
};
-
// send remote request to load message list
this.list_mailbox_remote = function(mbox, page, add_url)
{
@@ -1487,7 +1496,6 @@
this.set_busy(true, 'loading');
this.http_request('list', url+add_url, true);
};
-
this.expunge_mailbox = function(mbox)
{
@@ -1506,7 +1514,6 @@
var url = '_mbox='+urlencode(mbox);
this.http_post('expunge', url+add_url, lock);
};
-
this.purge_mailbox = function(mbox)
{
@@ -1594,6 +1601,8 @@
rows[uid].forwarded = status;
else if (flag == 'flagged')
rows[uid].flagged = status;
+
+ this.env.messages[uid] = rows[uid];
}
// set message row status, class and icon
@@ -1626,6 +1635,17 @@
{
rows[uid].classname = rows[uid].classname.replace(/\s*deleted/, '');
this.set_classname(rows[uid].obj, 'deleted', false);
+ }
+
+ if (rows[uid].flagged && rows[uid].classname.indexOf('flagged')<0)
+ {
+ rows[uid].classname += ' flagged';
+ this.set_classname(rows[uid].obj, 'flagged', true);
+ }
+ else if (!rows[uid].flagged && rows[uid].classname.indexOf('flagged')>=0)
+ {
+ rows[uid].classname = rows[uid].classname.replace(/\s*flagged/, '');
+ this.set_classname(rows[uid].obj, 'flagged', false);
}
this.set_message_icon(uid);
@@ -1694,7 +1714,6 @@
this.permanently_remove_messages();
};
-
// delete the selected messages permanently
this.permanently_remove_messages = function()
{
@@ -1728,14 +1747,14 @@
this.message_list.remove_row(id, (n == selection.length-1));
else
{
- rows[id].deleted = true;
+ this.set_message_status(id, 'deleted', true);
if (this.env.read_when_deleted)
- rows[id].unread = false;
+ this.set_message_status(id, 'unread', false);
this.set_message(id);
}
}
}
-
+
// also send search request to get the right messages
if (this.env.search_request)
add_url += '&_search='+this.env.search_request;
@@ -1743,7 +1762,6 @@
// send request to server
this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
};
-
// set a specific flag to one or more messages
this.mark_message = function(flag, uid)
@@ -1858,7 +1876,6 @@
return true;
};
-
this.flag_as_undeleted = function(a_uids)
{
for (var i=0; i<a_uids.length; i++)
@@ -1868,7 +1885,6 @@
return true;
};
-
this.flag_as_deleted = function(a_uids)
{
var add_url = '';
@@ -1893,7 +1909,6 @@
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)
@@ -1909,11 +1924,7 @@
{
uid = a_uids[i];
if (rows[uid])
- {
- rows[uid].unread = false;
- rows[uid].read = true;
- this.set_message(uid);
- }
+ this.set_message(uid, 'unread', false);
}
};
@@ -1941,7 +1952,6 @@
/********* message compose methods *********/
/*********************************************************/
-
// checks the input fields before sending a message
this.check_compose_input = function()
{
@@ -1949,8 +1959,17 @@
var input_to = rcube_find_object('_to');
var input_cc = rcube_find_object('_cc');
var input_bcc = rcube_find_object('_bcc');
+ var input_from = rcube_find_object('_from');
var input_subject = rcube_find_object('_subject');
var input_message = rcube_find_object('_message');
+
+ // check sender (if have no identities)
+ if (input_from.type == 'text' && !rcube_check_email(input_from.value, true))
+ {
+ alert(this.get_label('nosenderwarning'));
+ input_from.focus();
+ return false;
+ }
// check for empty recipient
var recipients = input_to.value ? input_to.value : (input_cc.value ? input_cc.value : input_bcc.value);
@@ -1990,23 +2009,37 @@
return false;
}
+ // Apply spellcheck changes if spell checker is active
+ this.stop_spellchecking();
+
return true;
};
+ this.stop_spellchecking = function()
+ {
+ if (this.env.spellcheck && !this.spellcheck_ready) {
+ exec_event(this.env.spellcheck.check_link, 'click');
+ this.set_spellcheck_state('ready');
+ }
+ };
+
this.display_spellcheck_controls = function(vis)
- {
+ {
if (this.env.spellcheck) {
+ // stop spellchecking process
+ if (!vis)
+ this.stop_spellchecking();
+
this.env.spellcheck.check_link.style.visibility = vis ? 'visible' : 'hidden';
this.env.spellcheck.switch_lan_pic.style.visibility = vis ? 'visible' : 'hidden';
- }
- };
+ }
+ };
this.set_spellcheck_state = function(s)
{
this.spellcheck_ready = (s=='check_spelling' || s=='ready');
this.enable_command('spellcheck', this.spellcheck_ready);
};
-
this.set_draft_id = function(id)
{
@@ -2023,7 +2056,6 @@
// Unlock interface now that saving is complete
this.busy = false;
};
-
this.compose_field_hash = function(save)
{
@@ -2058,7 +2090,6 @@
return str;
};
-
this.change_identity = function(obj)
{
if (!obj || !obj.options)
@@ -2091,6 +2122,8 @@
message = message.substring(0, p-1) + message.substring(p+sig.length, message.length);
}
+ message = message.replace(/[\r\n]+$/, '');
+
// add the new signature string
if (this.env.signatures && this.env.signatures[id])
{
@@ -2101,7 +2134,7 @@
}
if (sig.indexOf('-- ')!=0)
sig = '-- \n'+sig;
- message += '\n'+sig;
+ message += '\n\n'+sig;
}
}
else
@@ -2142,7 +2175,6 @@
return true;
};
-
this.show_attachment_form = function(a)
{
if (!this.gui_objects.uploadbox)
@@ -2173,7 +2205,6 @@
return true;
};
-
// upload attachment file
this.upload_file = function(form)
@@ -2225,7 +2256,6 @@
return true;
};
-
// add file name to attachment list
// called from upload page
this.add2attachment_list = function(name, content)
@@ -2269,7 +2299,7 @@
};
// send remote request to search mail or contacts
- this.qsearch = function(value)
+ this.qsearch = function(value, addurl)
{
if (value != '')
{
@@ -2278,12 +2308,18 @@
else if (this.contact_list) {
this.contact_list.clear(true);
this.show_contentframe(false);
- }
+ }
+
+ if (this.gui_objects.search_filter)
+ addurl = '&_filter=' + this.gui_objects.search_filter.value;
// reset vars
this.env.current_page = 1;
this.set_busy(true, 'searching');
- this.http_request('search', '_q='+urlencode(value)+(this.env.mailbox ? '&_mbox='+urlencode(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) : '')
+ + (addurl ? addurl : ''), true);
}
return true;
};
@@ -2298,7 +2334,6 @@
return true;
};
-
this.sent_successfully = function(type, msg)
{
this.list_mailbox();
@@ -2312,10 +2347,7 @@
// handler for keyboard events on address-fields
this.ksearch_keypress = function(e, obj)
- {
- if (typeof(this.env.contacts)!='object' || !this.env.contacts.length)
- return true;
-
+ {
if (this.ksearch_timer)
clearTimeout(this.ksearch_timer);
@@ -2331,24 +2363,13 @@
break;
var dir = key==38 ? 1 : 0;
- var next;
highlight = document.getElementById('rcmksearchSelected');
if (!highlight)
highlight = this.ksearch_pane.ul.firstChild;
- if (highlight && (next = dir ? highlight.previousSibling : highlight.nextSibling))
- {
- highlight.removeAttribute('id');
- this.set_classname(highlight, 'selected', false);
- }
-
- if (next)
- {
- next.setAttribute('id', 'rcmksearchSelected');
- this.set_classname(next, 'selected', true);
- this.ksearch_selected = next._rcm_id;
- }
+ if (highlight)
+ this.ksearch_select(dir ? highlight.previousSibling : highlight.nextSibling);
return rcube_event.cancel(e);
@@ -2356,7 +2377,7 @@
if(mod == SHIFT_KEY)
break;
- case 13: // enter
+ case 13: // enter
if (this.ksearch_selected===null || !this.ksearch_input || !this.ksearch_value)
break;
@@ -2377,8 +2398,22 @@
this.ksearch_input = obj;
return true;
- };
+ };
+
+ this.ksearch_select = function(node)
+ {
+ var current = document.getElementById('rcmksearchSelected');
+ if (current && node) {
+ current.removeAttribute('id');
+ this.set_classname(current, 'selected', false);
+ }
+ if (node) {
+ node.setAttribute('id', 'rcmksearchSelected');
+ this.set_classname(node, 'selected', true);
+ this.ksearch_selected = node._rcm_id;
+ }
+ };
this.insert_recipient = function(id)
{
@@ -2402,13 +2437,15 @@
this.ksearch_input.setSelectionRange(cpos, cpos);
};
-
// address search processor
this.ksearch_get_results = function()
- {
+ {
var inp_value = this.ksearch_input ? this.ksearch_input.value : null;
- if (inp_value===null)
+ if (inp_value === null)
return;
+
+ if (this.ksearch_pane && this.ksearch_pane.visible)
+ this.ksearch_pane.show(0);
// get string from current cursor pos to last comma
var cpos = this.get_caret_pos(this.ksearch_input);
@@ -2418,45 +2455,45 @@
// trim query string
q = q.replace(/(^\s+|\s+$)/g, '').toLowerCase();
- if (!q.length || q==this.ksearch_value)
- {
- if (!q.length && this.ksearch_pane && this.ksearch_pane.visible)
- this.ksearch_pane.show(0);
-
- return;
- }
+ // Don't (re-)search if string is empty or if the last results are still active
+ if (!q.length || q == this.ksearch_value)
+ return;
this.ksearch_value = q;
- // start searching the contact list
- var a_results = new Array();
- var a_result_ids = new Array();
- var c=0;
- for (var i=0; i<this.env.contacts.length; i++)
- {
- if (this.env.contacts[i].toLowerCase().indexOf(q)>=0)
- {
- a_results[c] = this.env.contacts[i];
- a_result_ids[c++] = i;
-
- if (c==15) // limit search results
- break;
- }
- }
+ this.display_message('searching', 'loading', true);
+ this.http_post('autocomplete', '_search='+q);
+ };
+ this.ksearch_query_results = function(results)
+ {
+ this.hide_message();
+ this.env.contacts = results ? results : [];
+
+ var result_ids = new Array();
+ var c=0;
+ for (var i=0; i < this.env.contacts.length; i++) {
+ result_ids[c++] = i;
+ if (c == 15) // limit search results
+ break;
+ }
+
+ this.ksearch_display_results(this.env.contacts, result_ids, c);
+ };
+
+ this.ksearch_display_results = function (a_results, a_result_ids, c)
+ {
// display search results
- if (c && a_results.length)
- {
+ if (c && a_results.length) {
var p, ul, li;
// create results pane if not present
- if (!this.ksearch_pane)
- {
+ if (!this.ksearch_pane) {
ul = document.createElement('UL');
this.ksearch_pane = new rcube_layer('rcmKSearchpane', {vis:0, zindex:30000});
this.ksearch_pane.elm.appendChild(ul);
this.ksearch_pane.ul = ul;
- }
+ }
else
ul = this.ksearch_pane.ul;
@@ -2464,52 +2501,58 @@
ul.innerHTML = '';
// add each result line to list
- for (i=0; i<a_results.length; i++)
- {
+ for (i=0; i<a_results.length; i++) {
li = document.createElement('LI');
- li.innerHTML = a_results[i].replace(/</, '<').replace(/>/, '>');
+ li.innerHTML = a_results[i].replace(/</, '<').replace(/>/, '>').replace(new RegExp('('+this.ksearch_value+')', 'ig'), '<b>$1</b>');
+ li.onmouseover = function(){ ref.ksearch_select(this); };
+ li.onmouseup = function(){ ref.ksearch_click(this) };
li._rcm_id = a_result_ids[i];
ul.appendChild(li);
- }
+ }
// check if last selected item is still in result list
- if (this.ksearch_selected!==null)
- {
+ if (this.ksearch_selected !== null) {
p = find_in_array(this.ksearch_selected, a_result_ids);
- if (p>=0 && ul.childNodes)
- {
+ if (p >= 0 && ul.childNodes) {
ul.childNodes[p].setAttribute('id', 'rcmksearchSelected');
this.set_classname(ul.childNodes[p], 'selected', true);
- }
+ }
else
this.ksearch_selected = null;
- }
+ }
// if no item selected, select the first one
- if (this.ksearch_selected===null)
- {
+ if (this.ksearch_selected === null) {
ul.firstChild.setAttribute('id', 'rcmksearchSelected');
this.set_classname(ul.firstChild, 'selected', true);
this.ksearch_selected = a_result_ids[0];
- }
+ }
// move the results pane right under the input box and make it visible
var pos = rcube_get_object_pos(this.ksearch_input);
this.ksearch_pane.move(pos.x, pos.y+this.ksearch_input.offsetHeight);
- this.ksearch_pane.show(1);
- }
+ this.ksearch_pane.show(1);
+ }
// hide results pane
else
this.ksearch_hide();
- };
+ };
+
+ this.ksearch_click = function(node)
+ {
+ this.insert_recipient(node._rcm_id);
+ this.ksearch_hide();
+
+ if (ref.ksearch_input)
+ this.ksearch_input.focus();
+ };
-
- this.ksearch_blur = function(e, obj)
+ this.ksearch_blur = function()
{
if (this.ksearch_timer)
clearTimeout(this.ksearch_timer);
- this.ksearch_value = '';
+ this.ksearch_value = '';
this.ksearch_input = null;
this.ksearch_hide();
@@ -2521,9 +2564,8 @@
this.ksearch_selected = null;
if (this.ksearch_pane)
- this.ksearch_pane.show(0);
+ this.ksearch_pane.show(0);
};
-
/*********************************************************/
@@ -2535,7 +2577,6 @@
if (list.key_pressed == list.DELETE_KEY)
this.command('delete');
};
-
this.contactlist_select = function(list)
{
@@ -2554,7 +2595,6 @@
return false;
};
-
this.list_contacts = function(src, page)
{
@@ -2598,7 +2638,6 @@
target.location.href = this.env.comm_path+(src ? '&_source='+urlencode(src) : '')+(page ? '&_page='+page : '')+add_url;
};
-
// send remote request to load contacts list
this.list_contacts_remote = function(src, page)
{
@@ -2618,7 +2657,6 @@
this.set_busy(true, 'loading');
this.http_request('list', url, true);
};
-
// load contact record
this.load_contact = function(cid, action, framed)
@@ -2644,13 +2682,13 @@
// copy a contact to the specified target (group or directory)
this.copy_contact = function(cid, to)
- {
+ {
if (!cid)
cid = this.contact_list.get_selection().join(',');
if (to != this.env.source && cid && this.env.address_sources[to] && !this.env.address_sources[to].readonly)
this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to));
- };
+ };
this.delete_contacts = function()
@@ -2688,7 +2726,6 @@
this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_from='+(this.env.action ? this.env.action : '')+qs);
return true;
};
-
// update a contact record in the list
this.update_contact_row = function(cid, cols_arr)
@@ -2761,7 +2798,6 @@
return true;
};
-
this.delete_identity = function(id)
{
// exit if no mailbox specified or if selection is empty
@@ -2776,7 +2812,6 @@
this.goto_url('delete-identity', '_iid='+id, true);
return true;
};
-
this.focus_subscription = function(id)
{
@@ -2803,7 +2838,6 @@
}
}
-
this.unfocus_subscription = function(id)
{
var row;
@@ -2814,7 +2848,6 @@
else
this.set_classname(this.subscription_list.frame, 'droptarget', false);
}
-
this.subscription_select = function(list)
{
@@ -2830,7 +2863,6 @@
this.gui_objects.createfolderhint.innerHTML = this.env.folder ? this.get_label('addsubfolderhint') : '';
};
-
this.subscription_move_folder = function(list)
{
var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
@@ -2840,12 +2872,13 @@
var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g');
var basename = this.env.folder.replace(reg, '');
var newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname));
+
+ this.set_busy(true, 'foldermoving');
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname), true);
}
this.drag_active = false;
this.unfocus_subscription(this.get_folder_row_id(this.env.dstfolder));
};
-
// tell server to create and subscribe a new mailbox
this.create_folder = function(name)
@@ -2873,7 +2906,6 @@
else if (form.elements['_folder_name'])
form.elements['_folder_name'].focus();
};
-
// start renaming the mailbox name.
// this will replace the name string with an input field
@@ -2909,7 +2941,6 @@
}
};
-
// remove the input field and write the current mailbox name to the table cell
this.reset_folder_rename = function()
{
@@ -2920,7 +2951,6 @@
this.edit_folder = null;
};
-
// handler for keyboard events on the input field
this.name_input_keypress = function(e)
@@ -2951,7 +2981,6 @@
this.reset_folder_rename();
};
-
// delete a specific mailbox with all its messages
this.delete_folder = function(id)
{
@@ -2970,7 +2999,6 @@
this.gui_objects.createfolderhint.innerHTML = '';
}
};
-
// add a new folder to the subscription list by cloning a folder row
this.add_folder_row = function(name, display_name, replace, before)
@@ -3047,7 +3075,6 @@
document.getElementById(id).scrollIntoView();
};
-
// replace an existing table row with a new folder line
this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
{
@@ -3074,7 +3101,6 @@
form.elements['_folder_newname'].value = '';
}
};
-
// remove the table row of a specific mailbox from the table
// (the row will not be removed, just hidden)
@@ -3103,13 +3129,11 @@
form.elements['_folder_newname'].value = '';
};
-
this.subscribe_folder = function(folder)
{
if (folder)
this.http_post('subscribe', '_mbox='+urlencode(folder));
};
-
this.unsubscribe_folder = function(folder)
{
@@ -3117,7 +3141,6 @@
this.http_post('unsubscribe', '_mbox='+urlencode(folder));
};
-
// helper method to find a specific mailbox row ID
this.get_folder_row_id = function(folder)
{
@@ -3155,7 +3178,6 @@
/********* GUI functionality *********/
/*********************************************************/
-
// eable/disable buttons for page shifting
this.set_page_buttons = function()
{
@@ -3164,7 +3186,6 @@
this.enable_command('previouspage', (this.env.current_page > 1));
this.enable_command('firstpage', (this.env.current_page > 1));
}
-
// set button to a specific state
this.set_button = function(command, state)
@@ -3298,7 +3319,6 @@
}
};
-
// set/unset a specific class name
this.set_classname = function(obj, classname, set)
{
@@ -3309,14 +3329,12 @@
obj.className += ' '+classname;
};
-
// write to the document/window title
this.set_pagetitle = function(title)
{
if (title && document.title)
document.title = title;
}
-
// display a system message
this.display_message = function(msg, type, hold)
@@ -3352,7 +3370,6 @@
this.message_timer = window.setTimeout(function(){ ref.hide_message(); }, this.message_time);
};
-
// make a message row disapear
this.hide_message = function()
{
@@ -3362,7 +3379,6 @@
this.gui_objects.message.onmousedown = null;
}
};
-
// mark a mailbox as selected and set environment variable
this.select_folder = function(name, old)
@@ -3397,7 +3413,6 @@
return null;
};
-
// for reordering column array, Konqueror workaround
this.set_message_coltypes = function(coltypes)
{
@@ -3421,7 +3436,7 @@
else
cell.innerHTML = this.get_label(this.coltypes[n]);
- cell.id = 'rcmHead'+col;
+ cell.id = 'rcm'+col;
}
else if (col == 'subject' && this.message_list)
this.message_list.subject_col = n+1;
@@ -3450,7 +3465,11 @@
var row = document.createElement('TR');
row.id = 'rcmrow'+uid;
- row.className = 'message '+(even ? 'even' : 'odd')+(flags.unread ? ' unread' : '')+(flags.deleted ? ' deleted' : '');
+ row.className = 'message'
+ + (even ? ' even' : ' odd')
+ + (flags.unread ? ' unread' : '')
+ + (flags.deleted ? ' deleted' : '')
+ + (flags.flagged ? ' flagged' : '');
if (this.message_list.in_selection(uid))
row.className += ' selected';
@@ -3488,17 +3507,14 @@
col.innerHTML = '<img src="'+this.env.flaggedicon+'" alt="" />';
else if(this.env.unflaggedicon)
col.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
- }
+ }
+ else if (c=='attachment')
+ col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '';
else
col.innerHTML = cols[c];
row.appendChild(col);
}
-
- col = document.createElement('TD');
- col.className = 'icon';
- col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '';
- row.appendChild(col);
this.message_list.insert_row(row, attop);
@@ -3511,7 +3527,6 @@
}
};
-
// replace content of row count display
this.set_rowcount = function(text)
{
@@ -3521,7 +3536,6 @@
// update page navigation buttons
this.set_page_buttons();
};
-
// replace content of mailboxname display
this.set_mailboxname = function(content)
@@ -3537,7 +3551,6 @@
this.gui_objects.quotadisplay.innerHTML = content;
};
-
// update the mailboxlist
this.set_unread_count = function(mbox, count, set_title)
{
@@ -3548,14 +3561,13 @@
this.set_unread_count_display(mbox, set_title);
}
-
// update the mailbox count display
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];
+ mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
text_obj = item.getElementsByTagName('a')[0];
reg = /\s+\([0-9]+\)$/i;
@@ -3564,10 +3576,10 @@
div.className.match(/collapsed/))
{
// add children's counters
- for (var k in this.env.unread_counts)
+ for (var k in this.env.unread_counts)
if (k.indexOf(mbox + this.env.delimiter) == 0) {
childcount += this.env.unread_counts[k];
- }
+ }
}
if (mycount && text_obj.innerHTML.match(reg))
@@ -3578,7 +3590,7 @@
text_obj.innerHTML = text_obj.innerHTML.replace(reg, '');
// set parent's display
- reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+');
+ reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+$');
if (mbox.match(reg))
this.set_unread_count_display(mbox.replace(reg, ''), false);
@@ -3603,6 +3615,16 @@
this.set_pagetitle(new_title);
}
};
+
+ // notifies that a new message(s) has hit the mailbox
+ this.new_message_focus = function()
+ {
+ // focus main window
+ if (this.env.framed && window.parent)
+ window.parent.focus();
+ else
+ window.focus();
+ }
// add row to contacts list
this.add_contact_row = function(cid, cols, select)
@@ -3634,36 +3656,12 @@
this.enable_command('export', (this.contact_list.rowcount > 0));
};
-
- this.toggle_editor = function(checkbox, textAreaId)
- {
- var ischecked = checkbox.checked;
- var composeElement = document.getElementById(textAreaId);
-
- if (ischecked)
- {
- var existingPlainText = composeElement.value;
- var htmlText = "<pre>" + existingPlainText + "</pre>";
- composeElement.value = htmlText;
- tinyMCE.execCommand('mceAddControl', true, textAreaId);
- }
- else
- {
- var thisMCE = tinyMCE.get(textAreaId);
- var existingHtml = thisMCE.getContent();
- this.html2plain(existingHtml, textAreaId);
- tinyMCE.execCommand('mceRemoveControl', true, textAreaId);
- }
- };
-
-
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;
}
-
// display fetched raw headers
this.set_headers = function(content)
@@ -3680,7 +3678,6 @@
this.set_busy(false);
}
};
-
// display all-headers row and fetch raw message headers
this.load_headers = function(elem)
@@ -3700,7 +3697,6 @@
this.http_post('headers', '_uid='+this.env.uid);
}
}
-
// hide all-headers row
this.hide_headers = function(elem)
@@ -3762,7 +3758,6 @@
this.redirect(this.env.comm_path+'&_action='+action+querystring, lock);
};
-
this.http_sockets = new Array();
// find a non-busy socket or create a new one
@@ -3781,7 +3776,6 @@
return this.http_sockets[i];
};
-
// send a http request to the server
this.http_request = function(action, querystring, lock)
{
@@ -3839,11 +3833,12 @@
this.http_response = function(request_obj)
{
var ctype = request_obj.get_header('Content-Type');
- if (ctype){
+ if (ctype)
+ {
ctype = String(ctype).toLowerCase();
var ctype_array=ctype.split(";");
ctype = ctype_array[0];
- }
+ }
if (request_obj.__lock)
this.set_busy(false);
@@ -3887,25 +3882,24 @@
case 'getunread':
case 'list':
if (this.task == 'mail') {
- if (this.message_list)
+ if (this.message_list && request_obj.__action == 'list')
this.msglist_select(this.message_list);
this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
this.enable_command('purge', this.purge_mailbox_test());
}
else if (this.task == 'addressbook')
this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
+
break;
- }
+ }
request_obj.reset();
};
-
// handle HTTP request errors
this.http_error = function(request_obj)
{
//alert('Error sending request: '+request_obj.url+' => HTTP '+request_obj.xmlhttp.status);
-
if (request_obj.__lock)
this.set_busy(false);
@@ -3914,7 +3908,6 @@
this.display_message('Unknown Server Error!', 'error');
};
-
// use an image to send a keep-alive siganl to the server
this.send_keep_alive = function()
{
@@ -3922,14 +3915,15 @@
this.http_request('keep-alive', '_t='+d.getTime());
};
-
// send periodic request to check for recent messages
- this.check_for_recent = function()
+ this.check_for_recent = function(setbusy)
{
if (this.busy)
return;
- this.set_busy(true, 'checkingmail');
+ if (setbusy)
+ this.set_busy(true, 'checkingmail');
+
this.http_request('check-recent', (this.env.search_request ? '_search='+this.env.search_request+'&' : '') + '_t='+(new Date().getTime()), true);
};
@@ -3979,7 +3973,6 @@
return obj.value.length;
};
-
this.set_caret2start = function(obj)
{
if (obj.createTextRange)
@@ -3993,7 +3986,6 @@
obj.focus();
};
-
// set all fields of a form disabled
this.lock_form = function(form, lock)
@@ -4015,7 +4007,6 @@
} // end object rcube_webmail
-
/**
* Class for sending HTTP requests
* @constructor
@@ -4025,7 +4016,6 @@
this.url = '';
this.busy = false;
this.xmlhttp = null;
-
// reset object properties
this.reset = function()
@@ -4042,7 +4032,6 @@
this.busy = false;
this.xmlhttp = null;
}
-
// create HTMLHTTP object
this.build = function()
@@ -4081,7 +4070,6 @@
this.xmlhttp.send(null);
};
-
this.POST = function(url, body, contentType)
{
// default value for contentType if not provided
@@ -4114,7 +4102,6 @@
this.xmlhttp.setRequestHeader('X-RoundCube-Referer', bw.get_cookie('roundcube_sessid'));
this.xmlhttp.send(req_body);
};
-
// handle onreadystatechange event
this.xmlhttp_onreadystatechange = function()
@@ -4168,10 +4155,10 @@
} // end class rcube_http_request
-
// helper function to call the init method with a delay
function call_init(o)
{
window.setTimeout('if (window[\''+o+'\'] && window[\''+o+'\'].init) { '+o+'.init(); }',
- bw.win ? 500 : 200);
+ bw.win ? 500 : 200);
}
+
--
Gitblit v1.9.1