From ecfaed571b2c38f4bcc2b6a0fa39fba15a5126ce Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 11 Nov 2011 10:04:45 -0500
Subject: [PATCH] - Apply fixes fom trunk up to r5414
---
program/js/app.js | 591 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 399 insertions(+), 192 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index e671ce4..5902b1d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -20,7 +20,7 @@
function rcube_webmail()
{
- this.env = {};
+ this.env = { recipients_separator:',', recipients_delimiter:', ' };
this.labels = {};
this.buttons = {};
this.buttons_sel = {};
@@ -86,7 +86,7 @@
if (over) button_prop.over = over;
this.buttons[command].push(button_prop);
-
+
if (this.loaded)
init_button(command, button_prop);
};
@@ -155,7 +155,7 @@
}
// enable general commands
- this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'undo', true);
+ this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', true);
if (this.env.permaurl)
this.enable_command('permaurl', true);
@@ -164,7 +164,7 @@
case 'mail':
// enable mail commands
- this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);
+ this.enable_command('list', 'checkmail', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);
if (this.gui_objects.messagelist) {
@@ -207,7 +207,7 @@
'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download',
'print', 'load-attachment', 'load-headers', 'forward-attachment'];
- if (this.env.action=='show' || this.env.action=='preview') {
+ if (this.env.action == 'show' || this.env.action == 'preview') {
this.enable_command(this.env.message_commands, this.env.uid);
this.enable_command('reply-list', this.env.list_post);
@@ -278,6 +278,9 @@
if (this.gui_objects.folderlist)
this.env.contactfolders = $.extend($.extend({}, this.env.address_sources), this.env.contactgroups);
+ this.enable_command('add', 'import', this.env.writable_source);
+ this.enable_command('list', 'listgroup', 'listsearch', 'advanced-search', true);
+
if (this.gui_objects.contactslist) {
this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
@@ -300,6 +303,7 @@
}
this.update_group_commands();
+ this.command('list');
}
this.set_page_buttons();
@@ -319,22 +323,12 @@
if (this.env.action == 'add' || this.env.action == 'edit')
this.init_contact_form();
}
+
if (this.gui_objects.qsearchbox) {
this.enable_command('search', 'reset-search', 'moveto', true);
- $(this.gui_objects.qsearchbox).select();
}
- if (this.contact_list && this.contact_list.rowcount > 0)
- this.enable_command('export', true);
-
- this.enable_command('add', 'import', this.env.writable_source);
- this.enable_command('list', 'listgroup', 'advanced-search', true);
-
- // load contacts of selected source
- if (!this.env.action)
- this.command('list', this.env.source);
break;
-
case 'settings':
this.enable_command('preferences', 'identities', 'save', 'folders', true);
@@ -386,7 +380,10 @@
$('#rcmloginpwd').focus();
// detect client timezone
- $('#rcmlogintz').val(new Date().getTimezoneOffset() / -60);
+ var tz = new Date().getTimezoneOffset() / -60;
+ var stdtz = new Date().getStdTimezoneOffset() / -60;
+ $('#rcmlogintz').val(stdtz);
+ $('#rcmlogindst').val(tz > stdtz ? 1 : 0);
// display 'loading' message on form submit, lock submit button
$('form').submit(function () {
@@ -445,6 +442,8 @@
// execute a specific command on the web client
this.command = function(command, props, obj)
{
+ var ret;
+
if (obj && obj.blur)
obj.blur();
@@ -461,31 +460,33 @@
}
// check input before leaving compose step
- if (this.task=='mail' && this.env.action=='compose' && $.inArray(command, this.env.compose_commands)<0) {
+ if (this.task == 'mail' && this.env.action == 'compose' && $.inArray(command, this.env.compose_commands)<0) {
if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
return false;
}
// process external commands
if (typeof this.command_handlers[command] === 'function') {
- var ret = this.command_handlers[command](props, obj);
+ ret = this.command_handlers[command](props, obj);
return ret !== undefined ? ret : (obj ? false : true);
}
else if (typeof this.command_handlers[command] === 'string') {
- var ret = window[this.command_handlers[command]](props, obj);
+ ret = window[this.command_handlers[command]](props, obj);
return ret !== undefined ? ret : (obj ? false : true);
}
// trigger plugin hooks
this.triggerEvent('actionbefore', {props:props, action:command});
- var ret = this.triggerEvent('before'+command, props);
+ ret = this.triggerEvent('before'+command, props);
if (ret !== undefined) {
- // abort if one the handlers returned false
+ // abort if one of the handlers returned false
if (ret === false)
return false;
else
props = ret;
}
+
+ ret = undefined;
// process internal command
switch (command) {
@@ -524,21 +525,15 @@
break;
case 'list':
- if (this.task=='mail') {
- if (!this.env.search_request || (props && props != this.env.mailbox))
- this.reset_qsearch();
-
+ this.reset_qsearch();
+ if (this.task == 'mail') {
this.list_mailbox(props);
if (this.env.trash_mailbox && !this.env.flag_for_deletion)
this.set_alttext('delete', this.env.mailbox != this.env.trash_mailbox ? 'movemessagetotrash' : 'deletemessage');
}
else if (this.task == 'addressbook') {
- if (!this.env.search_request || (props != this.env.source))
- this.reset_qsearch();
-
this.list_contacts(props);
- this.enable_command('add', 'import', this.env.writable_source);
}
break;
@@ -816,17 +811,11 @@
break;
case 'compose':
- var url = this.env.comm_path+'&_action=compose';
+ var url = this.url('mail/compose');
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;
- }
- else if (props)
+ if (props)
url += '&_to='+urlencode(props);
}
// modify url if we're in addressbook
@@ -850,10 +839,14 @@
}
if (a_cids.length)
- this.http_post('mailto', {_cid: a_cids.join(','), _source: this.env.source}, true);
+ this.http_post('mailto', { _cid: a_cids.join(','), _source: this.env.source}, true);
+ else if (this.env.group)
+ this.http_post('mailto', { _gid: this.env.group, _source: this.env.source}, true);
break;
}
+ else if (props)
+ url += '&_to='+urlencode(props);
this.redirect(url);
break;
@@ -996,18 +989,19 @@
this.select_all_mode = false;
if (s && this.env.mailbox)
- this.list_mailbox(this.env.mailbox);
+ this.list_mailbox(this.env.mailbox, 1);
else if (s && this.task == 'addressbook') {
if (this.env.source == '') {
for (n in this.env.address_sources) break;
this.env.source = n;
this.env.group = '';
}
- this.list_contacts(this.env.source, this.env.group);
+ this.list_contacts(this.env.source, this.env.group, 1);
}
break;
case 'listgroup':
+ this.reset_qsearch();
this.list_contacts(props.source, props.id);
break;
@@ -1054,15 +1048,17 @@
// unified command call (command name == function name)
default:
var func = command.replace(/-/g, '_');
- if (this[func] && typeof this[func] === 'function')
- this[func](props);
+ if (this[func] && typeof this[func] === 'function') {
+ ret = this[func](props);
+ }
break;
}
- this.triggerEvent('after'+command, props);
+ if (this.triggerEvent('after'+command, props) === false)
+ ret = false;
this.triggerEvent('actionafter', {props:props, action:command});
- return obj ? false : true;
+ return ret === false ? false : obj ? false : true;
};
// set command(s) enabled or disabled
@@ -1407,6 +1403,10 @@
{
var model, list, li, id;
+ // ignore event if jquery UI dialog is open
+ if ($(rcube_event.get_target(e)).closest('.ui-dialog, .ui-widget-overlay').length)
+ return;
+
if (list = this.message_list) {
if (!rcube_mouse_is_over(e, list.list.parentNode))
list.blur();
@@ -1528,11 +1528,12 @@
this.msglist_keypress = function(list)
{
+ if (list.modkey == CONTROL_KEY)
+ return;
+
if (list.key_pressed == list.ENTER_KEY)
this.command('show');
- else if (list.key_pressed == list.DELETE_KEY)
- this.command('delete');
- else if (list.key_pressed == list.BACKSPACE_KEY)
+ else if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
this.command('delete');
else if (list.key_pressed == 33)
this.command('previouspage');
@@ -1646,14 +1647,18 @@
if (!this.gui_objects.messagelist || !this.message_list)
return false;
+ // Prevent from adding messages from different folder (#1487752)
+ if (flags.mbox != this.env.mailbox && !flags.skip_mbox_check)
+ return false;
+
if (!this.env.messages[uid])
this.env.messages[uid] = {};
// merge flags over local message object
$.extend(this.env.messages[uid], {
deleted: flags.deleted?1:0,
- replied: flags.replied?1:0,
- unread: flags.unread?1:0,
+ replied: flags.answered?1:0,
+ unread: !flags.seen?1:0,
forwarded: flags.forwarded?1:0,
flagged: flags.flagged?1:0,
has_children: flags.has_children?1:0,
@@ -1667,23 +1672,18 @@
flags: flags.extra_flags
});
- var c, html, tree = expando = '',
+ var c, n, col, html, 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],
css_class = 'message'
- + (even ? ' even' : ' odd')
- + (flags.unread ? ' unread' : '')
+ + (!flags.seen ? ' unread' : '')
+ (flags.deleted ? ' deleted' : '')
+ (flags.flagged ? ' flagged' : '')
- + (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '')
+ + (flags.unread_children && flags.seen && !this.env.autoexpand_threads ? ' unroot' : '')
+ (message.selected ? ' selected' : ''),
// for performance use DOM instead of jQuery here
- row = document.createElement('tr'),
- col = document.createElement('td');
+ row = document.createElement('tr');
row.id = 'rcmrow'+uid;
row.className = css_class;
@@ -1694,12 +1694,12 @@
css_class += ' status';
if (flags.deleted)
css_class += ' deleted';
- else if (flags.unread)
+ else if (!flags.seen)
css_class += ' unread';
else if (flags.unread_children > 0)
css_class += ' unreadchildren';
}
- if (flags.replied)
+ if (flags.answered)
css_class += ' replied';
if (flags.forwarded)
css_class += ' forwarded';
@@ -1710,9 +1710,10 @@
// threads
if (this.env.threading) {
- // This assumes that div width is hardcoded to 15px,
- var width = message.depth * 15;
if (message.depth) {
+ // This assumes that div width is hardcoded to 15px,
+ tree += '<span id="rcmtab' + uid + '" class="branch" style="width:' + (message.depth * 15) + 'px;"> </span>';
+
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))
@@ -1727,13 +1728,9 @@
if (message.expanded === undefined && (this.env.autoexpand_threads == 1 || (this.env.autoexpand_threads == 2 && message.unread_children))) {
message.expanded = true;
}
- }
- if (width)
- tree += '<span id="rcmtab' + uid + '" class="branch" style="width:' + width + 'px;"> </span>';
-
- if (message.has_children && !message.depth)
expando = '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '"> </div>';
+ }
}
tree += '<span id="msgicn'+uid+'" class="'+css_class+'"> </span>';
@@ -1747,7 +1744,7 @@
}
// add each submitted col
- for (var n in this.env.coltypes) {
+ for (n in this.env.coltypes) {
c = this.env.coltypes[n];
col = document.createElement('td');
col.className = String(c).toLowerCase();
@@ -1767,7 +1764,7 @@
else if (c == 'status') {
if (flags.deleted)
css_class = 'deleted';
- else if (flags.unread)
+ else if (!flags.seen)
css_class = 'unread';
else if (flags.unread_children > 0)
css_class = 'unreadchildren';
@@ -1777,8 +1774,11 @@
}
else if (c == 'threads')
html = expando;
- else if (c == 'subject')
+ else if (c == 'subject') {
+ if (bw.ie)
+ col.onmouseover = function() { rcube_webmail.long_subject_title_ie(this, message.depth+1); };
html = tree + cols[c];
+ }
else if (c == 'priority') {
if (flags.prio > 0 && flags.prio < 6)
html = '<span class="prio'+flags.prio+'"> </span>';
@@ -1948,18 +1948,13 @@
// list messages of a specific mailbox using filter
this.filter_mailbox = function(filter)
{
- var search, lock = this.set_busy(true, 'searching');
-
- if (this.gui_objects.qsearchbox)
- search = this.gui_objects.qsearchbox.value;
+ var lock = this.set_busy(true, 'searching');
this.clear_message_list();
// reset vars
this.env.current_page = 1;
- this.http_request('search', '_filter='+filter
- + (search ? '&_q='+urlencode(search) : '')
- + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), lock);
+ this.http_request('search', this.search_params(false, filter), lock);
};
// list messages of a specific mailbox
@@ -1994,7 +1989,7 @@
if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
url += '&_refresh=1';
- this.select_folder(mbox, this.env.mailbox);
+ this.select_folder(mbox);
this.env.mailbox = mbox;
// load message list remotely
@@ -2058,8 +2053,7 @@
new_row = tbody.firstChild;
while (new_row) {
- if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid])
- && r.unread_children) {
+ if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) {
this.message_list.expand_all(r);
this.set_unread_children(r.uid);
}
@@ -2094,8 +2088,12 @@
};
// Initializes threads indicators/expanders after list update
- this.init_threads = function(roots)
+ this.init_threads = function(roots, mbox)
{
+ // #1487752
+ if (mbox && mbox != this.env.mailbox)
+ return false;
+
for (var n=0, len=roots.length; n<len; n++)
this.add_tree_icons(roots[n]);
this.expand_threads();
@@ -2499,7 +2497,7 @@
// if there is a trash mailbox defined and we're not currently in it
else {
// if shift was pressed delete it immediately
- if (list && list.shiftkey) {
+ if (list && list.modkey == SHIFT_KEY) {
if (confirm(this.get_label('deletemessagesconfirm')))
this.permanently_remove_messages();
}
@@ -2802,14 +2800,15 @@
this.expunge_mailbox = function(mbox)
{
- var lock = false,
- url = '_mbox='+urlencode(mbox);
+ var lock, url = '_mbox='+urlencode(mbox);
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
- lock = this.set_busy(true, 'loading');
- url += '&_reload=1';
- }
+ lock = this.set_busy(true, 'loading');
+ url += '&_reload=1';
+ if (this.env.search_request)
+ url += '&_search='+this.env.search_request;
+ }
// send request to server
this.http_post('expunge', url, lock);
@@ -2921,6 +2920,8 @@
this.init_address_input_events = function(obj, props)
{
+ this.env.recipients_delimiter = this.env.recipients_separator + ' ';
+
obj[bw.ie || bw.safari || bw.chrome ? 'keydown' : 'keypress'](function(e) { return ref.ksearch_keydown(e, this, props); })
.attr('autocomplete', 'off');
};
@@ -3158,7 +3159,7 @@
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/))
+ if (!sig.match(/^--[ -]\n/m))
sig = sig_separator + '\n' + sig;
p = this.env.sig_above ? message.indexOf(sig) : message.lastIndexOf(sig);
@@ -3170,7 +3171,7 @@
sig = this.env.signatures[id]['is_html'] ? this.env.signatures[id]['plain_text'] : this.env.signatures[id]['text'];
sig = sig.replace(/\r\n/g, '\n');
- if (!sig.match(/^--[ -]\n/))
+ if (!sig.match(/^--[ -]\n/m))
sig = sig_separator + '\n' + sig;
if (this.env.sig_above) {
@@ -3239,12 +3240,12 @@
if (this.env.signatures[id]) {
if (this.env.signatures[id].is_html) {
sig = this.env.signatures[id].text;
- if (!this.env.signatures[id].plain_text.match(/^--[ -]\r?\n/))
+ if (!this.env.signatures[id].plain_text.match(/^--[ -]\r?\n/m))
sig = sig_separator + '<br />' + sig;
}
else {
sig = this.env.signatures[id].text;
- if (!sig.match(/^--[ -]\r?\n/))
+ if (!sig.match(/^--[ -]\r?\n/m))
sig = sig_separator + '\n' + sig;
sig = '<pre>' + sig + '</pre>';
}
@@ -3410,38 +3411,56 @@
this.qsearch = function(value)
{
if (value != '') {
- var n, r, addurl = '', mods_arr = [],
- mods = this.env.search_mods,
- mbox = this.env.mailbox,
- lock = this.set_busy(true, 'searching');
+ var n, lock = this.set_busy(true, 'searching');
- if (this.message_list) {
+ if (this.message_list)
this.clear_message_list();
- if (mods)
- mods = mods[mbox] ? mods[mbox] : mods['*'];
- } else if (this.contact_list) {
+ else if (this.contact_list)
this.list_contacts_clear();
- }
+
+ // reset vars
+ this.env.current_page = 1;
+ r = this.http_request('search', this.search_params(value)
+ + (this.env.source ? '&_source='+urlencode(this.env.source) : '')
+ + (this.env.group ? '&_gid='+urlencode(this.env.group) : ''), lock);
+
+ this.env.qsearch = {lock: lock, request: r};
+ }
+ };
+
+ // build URL params for search
+ this.search_params = function(search, filter)
+ {
+ var n, url = [], mods_arr = [],
+ mods = this.env.search_mods,
+ mbox = this.env.mailbox;
+
+ if (!filter && this.gui_objects.search_filter)
+ filter = this.gui_objects.search_filter.value;
+
+ if (!search && this.gui_objects.qsearchbox)
+ search = this.gui_objects.qsearchbox.value;
+
+ if (filter)
+ url.push('_filter=' + urlencode(filter));
+
+ if (search) {
+ url.push('_q='+urlencode(search));
+
+ if (mods && this.message_list)
+ mods = mods[mbox] ? mods[mbox] : mods['*'];
if (mods) {
for (n in mods)
mods_arr.push(n);
- addurl += '&_headers='+mods_arr.join(',');
+ url.push('_headers='+mods_arr.join(','));
}
-
- if (this.gui_objects.search_filter)
- addurl += '&_filter=' + this.gui_objects.search_filter.value;
-
- // reset vars
- this.env.current_page = 1;
- r = this.http_request('search', '_q='+urlencode(value)
- + (mbox ? '&_mbox='+urlencode(mbox) : '')
- + (this.env.source ? '&_source='+urlencode(this.env.source) : '')
- + (this.env.group ? '&_gid='+urlencode(this.env.group) : '')
- + (addurl ? addurl : ''), lock);
-
- this.env.qsearch = {lock: lock, request: r};
}
+
+ if (mbox)
+ url.push('_mbox='+urlencode(mbox));
+
+ return url.join('&');
};
// reset quick-search form
@@ -3455,6 +3474,7 @@
this.env.qsearch = null;
this.env.search_request = null;
+ this.env.search_id = null;
};
this.sent_successfully = function(type, msg)
@@ -3496,13 +3516,15 @@
return rcube_event.cancel(e);
- case 9: // tab
- if (mod == SHIFT_KEY)
- break;
+ case 9: // tab
+ if (mod == SHIFT_KEY || !this.ksearch_visible()) {
+ this.ksearch_hide();
+ return;
+ }
case 13: // enter
- if (this.ksearch_selected === null || !this.ksearch_value)
- break;
+ if (!this.ksearch_visible())
+ return false;
// insert selected address and hide ksearch pane
this.insert_recipient(this.ksearch_selected);
@@ -3527,6 +3549,11 @@
return true;
};
+ this.ksearch_visible = function()
+ {
+ return (this.ksearch_selected !== null && this.ksearch_selected !== undefined && this.ksearch_value);
+ };
+
this.ksearch_select = function(node)
{
var current = $('#rcmksearchSelected');
@@ -3542,7 +3569,7 @@
this.insert_recipient = function(id)
{
- if (!this.env.contacts[id] || !this.ksearch_input)
+ if (id === null || !this.env.contacts[id] || !this.ksearch_input)
return;
// get cursor pos
@@ -3559,13 +3586,13 @@
// insert all members of a group
if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].id) {
- insert += this.env.contacts[id].name + ', ';
+ insert += this.env.contacts[id].name + this.env.recipients_delimiter;
this.group2expand = $.extend({}, this.env.contacts[id]);
this.group2expand.input = this.ksearch_input;
this.http_request('mail/group-expand', '_source='+urlencode(this.env.contacts[id].source)+'&_gid='+urlencode(this.env.contacts[id].id), false);
}
else if (typeof this.env.contacts[id] === 'string') {
- insert = this.env.contacts[id] + ', ';
+ insert = this.env.contacts[id] + this.env.recipients_delimiter;
trigger = true;
}
@@ -3602,9 +3629,10 @@
// get string from current cursor pos to last comma
var cpos = this.get_caret_pos(this.ksearch_input),
- p = inp_value.lastIndexOf(',', cpos-1),
+ p = inp_value.lastIndexOf(this.env.recipients_separator, cpos-1),
q = inp_value.substring(p+1, cpos),
- min = this.env.autocomplete_min_length;
+ min = this.env.autocomplete_min_length,
+ ac = this.ksearch_data;
// trim query string
q = $.trim(q);
@@ -3613,28 +3641,25 @@
if (q == this.ksearch_value)
return;
+ this.ksearch_destroy();
+
if (q.length && q.length < min) {
- if (!this.env.acinfo) {
- this.env.acinfo = this.display_message(
+ if (!this.ksearch_info) {
+ this.ksearch_info = this.display_message(
this.get_label('autocompletechars').replace('$min', min));
}
return;
- }
- else if (this.env.acinfo) {
- this.hide_message(this.env.acinfo);
}
var old_value = this.ksearch_value;
this.ksearch_value = q;
- this.ksearch_destroy();
-
// ...string is empty
if (!q.length)
return;
- // ...new search value contains old one and previous search result was empty
- if (old_value && old_value.length && this.env.contacts && !this.env.contacts.length && q.indexOf(old_value) == 0)
+ // ...new search value contains old one and previous search was not finished or its result was empty
+ if (old_value && old_value.length && q.indexOf(old_value) == 0 && (!ac || !ac.num) && this.env.contacts && !this.env.contacts.length)
return;
var i, lock, source, xhr, reqid = new Date().getTime(),
@@ -3642,7 +3667,8 @@
sources = props && props.sources ? props.sources : [],
action = props && props.action ? props.action : 'mail/autocomplete';
- this.ksearch_data = {id: reqid, sources: sources.slice(), action: action, locks: [], requests: []};
+ this.ksearch_data = {id: reqid, sources: sources.slice(), action: action,
+ locks: [], requests: [], num: sources.length};
for (i=0; i<threads; i++) {
source = this.ksearch_data.sources.shift();
@@ -3669,7 +3695,9 @@
return;
// display search results
- var p, ul, li, text, init, s_val = this.ksearch_value,
+ var ul, li, text, init,
+ value = this.ksearch_value,
+ data = this.ksearch_data,
maxlen = this.env.autocomplete_max ? this.env.autocomplete_max : 15;
// create results pane if not present
@@ -3702,7 +3730,7 @@
for (i=0; i < results.length && maxlen > 0; i++) {
text = typeof results[i] === 'object' ? results[i].name : results[i];
li = document.createElement('LI');
- li.innerHTML = text.replace(new RegExp('('+RegExp.escape(s_val)+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
+ li.innerHTML = text.replace(new RegExp('('+RegExp.escape(value)+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
li.onmouseover = function(){ ref.ksearch_select(this); };
li.onmouseup = function(){ ref.ksearch_click(this) };
li._rcm_id = this.env.contacts.length + i;
@@ -3724,15 +3752,24 @@
this.env.contacts = this.env.contacts.concat(results);
// run next parallel search
- if (maxlen > 0 && this.ksearch_data.id == reqid && this.ksearch_data.sources.length) {
- var lock, xhr, props = this.ksearch_data, source = props.sources.shift();
- if (source) {
- lock = this.display_message(this.get_label('searching'), 'loading');
- xhr = this.http_post(props.action, '_search='+urlencode(s_val)+'&_id='+reqid
- +'&_source='+urlencode(source), lock);
+ if (data.id == reqid) {
+ data.num--;
+ if (maxlen > 0 && data.sources.length) {
+ var lock, xhr, source = data.sources.shift();
+ if (source) {
+ lock = this.display_message(this.get_label('searching'), 'loading');
+ xhr = this.http_post(data.action, '_search='+urlencode(value)+'&_id='+reqid
+ +'&_source='+urlencode(source), lock);
- this.ksearch_data.locks.push(lock);
- this.ksearch_data.requests.push(xhr);
+ this.ksearch_data.locks.push(lock);
+ this.ksearch_data.requests.push(xhr);
+ }
+ }
+ else if (!maxlen) {
+ if (!this.ksearch_msg)
+ this.ksearch_msg = this.display_message(this.get_label('autocompletemore'));
+ // abort pending searches
+ this.ksearch_abort();
}
}
};
@@ -3766,8 +3803,24 @@
this.ksearch_destroy();
};
- // Aborts pending autocomplete requests
+ // Clears autocomplete data/requests
this.ksearch_destroy = function()
+ {
+ this.ksearch_abort();
+
+ if (this.ksearch_info)
+ this.hide_message(this.ksearch_info);
+
+ if (this.ksearch_msg)
+ this.hide_message(this.ksearch_msg);
+
+ this.ksearch_data = null;
+ this.ksearch_info = null;
+ this.ksearch_msg = null;
+ }
+
+ // Aborts pending autocomplete requests
+ this.ksearch_abort = function()
{
var i, len, ac = this.ksearch_data;
@@ -3776,9 +3829,8 @@
for (i=0, len=ac.locks.length; i<len; i++)
this.abort_request({request: ac.requests[i], lock: ac.locks[i]});
+ };
- this.ksearch_data = null;
- }
/*********************************************************/
/********* address book methods *********/
@@ -3820,7 +3872,7 @@
}
}
- this.enable_command('compose', list.selection.length > 0);
+ this.enable_command('compose', this.env.group || list.selection.length > 0);
this.enable_command('edit', id && writable);
this.enable_command('delete', list.selection.length && writable);
@@ -3829,7 +3881,7 @@
this.list_contacts = function(src, group, page)
{
- var add_url = '',
+ var folder, add_url = '',
target = window;
if (!src)
@@ -3845,7 +3897,12 @@
else if (group != this.env.group)
page = this.env.current_page = 1;
- this.select_folder((group ? 'G'+src+group : src), (this.env.group ? 'G'+this.env.source+this.env.group : this.env.source));
+ if (this.env.search_id)
+ folder = 'S'+this.env.search_id;
+ else
+ folder = group ? 'G'+src+group : src;
+
+ this.select_folder(folder);
this.env.source = src;
this.env.group = group;
@@ -3890,8 +3947,8 @@
if (group)
url += '&_gid='+group;
- // also send search request to get the right messages
- if (this.env.search_request)
+ // also send search request to get the right messages
+ if (this.env.search_request)
url += '&_search='+this.env.search_request;
this.http_request('list', url, lock);
@@ -3901,7 +3958,8 @@
{
this.contact_list.clear(true);
this.show_contentframe(false);
- this.enable_command('delete', 'compose', false);
+ this.enable_command('delete', false);
+ this.enable_command('compose', this.env.group ? true : false);
};
// load contact record
@@ -3974,8 +4032,10 @@
this.delete_contacts = function()
{
// exit if no mailbox specified or if selection is empty
- var selection = this.contact_list.get_selection();
- if (!(selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm')))
+ var selection = this.contact_list.get_selection(),
+ undelete = this.env.address_sources[this.env.source].undelete;
+
+ if (!(selection.length || this.env.cid) || (!undelete && !confirm(this.get_label('deletecontactconfirm'))))
return;
var id, n, a_cids = [], qs = '';
@@ -4002,7 +4062,10 @@
qs += '&_search='+this.env.search_request;
// send request to server
- this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_from='+(this.env.action ? this.env.action : '')+qs);
+ this.http_post('delete', '_cid='+urlencode(a_cids.join(','))
+ +'&_source='+urlencode(this.env.source)
+ +'&_from='+(this.env.action ? this.env.action : '')+qs,
+ this.display_message(this.get_label('contactdeleting'), 'loading'));
return true;
};
@@ -4041,31 +4104,29 @@
// add row to contacts list
this.add_contact_row = function(cid, cols, select)
{
- if (!this.gui_objects.contactslist || !this.gui_objects.contactslist.tBodies[0])
+ if (!this.gui_objects.contactslist)
return false;
- var tbody = this.gui_objects.contactslist.tBodies[0],
- rowcount = tbody.rows.length,
- even = rowcount%2,
+ var c, list = this.contact_list,
row = document.createElement('tr');
row.id = 'rcmrow'+String(cid).replace(this.identifier_expr, '_');
- row.className = 'contact '+(even ? 'even' : 'odd');
+ row.className = 'contact';
- if (this.contact_list.in_selection(cid))
+ if (list.in_selection(cid))
row.className += ' selected';
// add each submitted col
- for (var c in cols) {
+ for (c in cols) {
col = document.createElement('td');
col.className = String(c).toLowerCase();
col.innerHTML = cols[c];
row.appendChild(col);
}
- this.contact_list.insert_row(row);
+ list.insert_row(row);
- this.enable_command('export', (this.contact_list.rowcount > 0));
+ this.enable_command('export', list.rowcount > 0);
};
this.init_contact_form = function()
@@ -4087,24 +4148,27 @@
this.selectedIndex = 0;
});
+ // enable date pickers on date fields
+ if ($.datepicker && this.env.date_format) {
+ $.datepicker.setDefaults({
+ dateFormat: this.env.date_format,
+ changeMonth: true,
+ changeYear: true,
+ yearRange: '-100:+10',
+ showOtherMonths: true,
+ selectOtherMonths: true,
+ monthNamesShort: this.env.month_names,
+ onSelect: function(dateText) { $(this).focus().val(dateText) }
+ });
+ $('input.datepicker').datepicker();
+ }
+
$("input[type='text']:visible").first().focus();
};
this.group_create = function()
{
- if (!this.gui_objects.folderlist)
- return;
-
- if (!this.name_input) {
- this.name_input = $('<input>').attr('type', 'text');
- this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
- this.name_input_li = $('<li>').addClass('contactgroup').append(this.name_input);
-
- var li = this.get_folder_li(this.env.source)
- this.name_input_li.insertAfter(li);
- }
-
- this.name_input.select().focus();
+ this.add_input_row('contactgroup');
};
this.group_rename = function()
@@ -4150,18 +4214,40 @@
this.list_contacts(prop.source, 0);
};
+ // @TODO: maybe it would be better to use popup instead of inserting input to the list?
+ this.add_input_row = function(type)
+ {
+ if (!this.gui_objects.folderlist)
+ return;
+
+ if (!this.name_input) {
+ this.name_input = $('<input>').attr('type', 'text').data('tt', type);
+ this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
+ this.name_input_li = $('<li>').addClass(type).append(this.name_input);
+
+ var li = type == 'contactsearch' ? $('li:last', this.gui_objects.folderlist) : this.get_folder_li(this.env.source);
+ this.name_input_li.insertAfter(li);
+ }
+
+ this.name_input.select().focus();
+ };
+
// handler for keyboard events on the input field
this.add_input_keydown = function(e)
{
- var key = rcube_event.get_keycode(e);
+ var key = rcube_event.get_keycode(e),
+ input = $(e.target), itype = input.data('tt');
// enter
if (key == 13) {
- var newname = this.name_input.val();
+ var newname = input.val();
if (newname) {
var lock = this.set_busy(true, 'loading');
- if (this.env.group_renaming)
+
+ if (itype == 'contactsearch')
+ this.http_post('search-create', '_search='+urlencode(this.env.search_request)+'&_name='+urlencode(newname), lock);
+ else if (this.env.group_renaming)
this.http_post('group-rename', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+'&_name='+urlencode(newname), lock);
else
this.http_post('group-create', '_source='+urlencode(this.env.source)+'&_name='+urlencode(newname), lock);
@@ -4332,6 +4418,9 @@
.appendTo(cell);
this.init_edit_field(col, input);
+
+ if (colprop.type == 'date' && $.datepicker)
+ input.datepicker();
}
else if (colprop.type == 'composite') {
var childcol, cp, first, templ, cols = [], suffices = [];
@@ -4477,11 +4566,106 @@
// unselect directory/group
this.unselect_directory = function()
{
- if (this.env.address_sources.length > 1 || this.env.group != '') {
- this.select_folder('', (this.env.group ? 'G'+this.env.source+this.env.group : this.env.source));
- this.env.group = '';
- this.env.source = '';
+ this.select_folder('');
+ this.enable_command('search-delete', false);
+ };
+
+ // callback for creating a new saved search record
+ this.insert_saved_search = function(name, id)
+ {
+ this.reset_add_input();
+
+ var key = 'S'+id,
+ link = $('<a>').attr('href', '#')
+ .attr('rel', id)
+ .click(function() { return rcmail.command('listsearch', id, this); })
+ .html(name),
+ li = $('<li>').attr({id: 'rcmli'+key.replace(this.identifier_expr, '_'), 'class': 'contactsearch'})
+ .append(link),
+ prop = {name:name, id:id, li:li[0]};
+
+ this.add_saved_search_row(prop, li);
+ this.select_folder('S'+id);
+ this.enable_command('search-delete', true);
+ this.env.search_id = id;
+
+ this.triggerEvent('abook_search_insert', prop);
+ };
+
+ // add saved search row to the list, with sorting
+ this.add_saved_search_row = function(prop, li, reloc)
+ {
+ var row, sibling, name = prop.name.toUpperCase();
+
+ // When renaming groups, we need to remove it from DOM and insert it in the proper place
+ if (reloc) {
+ row = li.clone(true);
+ li.remove();
}
+ else
+ row = li;
+
+ $('li[class~="contactsearch"]', this.gui_objects.folderlist).each(function(i, elem) {
+ if (!sibling)
+ sibling = this.previousSibling;
+
+ if (name >= $(this).text().toUpperCase())
+ sibling = elem;
+ else
+ return false;
+ });
+
+ if (sibling)
+ row.insertAfter(sibling);
+ else
+ row.appendTo(this.gui_objects.folderlist);
+ };
+
+ // creates an input for saved search name
+ this.search_create = function()
+ {
+ this.add_input_row('contactsearch');
+ };
+
+ this.search_delete = function()
+ {
+ if (this.env.search_request) {
+ var lock = this.set_busy(true, 'savedsearchdeleting');
+ this.http_post('search-delete', '_sid='+urlencode(this.env.search_id), lock);
+ }
+ };
+
+ // callback from server upon search-delete command
+ this.remove_search_item = function(id)
+ {
+ var li, key = 'S'+id;
+ if ((li = this.get_folder_li(key))) {
+ this.triggerEvent('search_delete', { id:id, li:li });
+
+ li.parentNode.removeChild(li);
+ }
+
+ this.env.search_id = null;
+ this.env.search_request = null;
+ this.list_contacts_clear();
+ this.reset_qsearch();
+ this.enable_command('search-delete', 'search-create', false);
+ };
+
+ this.listsearch = function(id)
+ {
+ var folder, lock = this.set_busy(true, 'searching');
+
+ if (this.contact_list) {
+ this.list_contacts_clear();
+ }
+
+ this.reset_qsearch();
+ this.select_folder('S'+id);
+
+ // reset vars
+ this.env.current_page = 1;
+ this.http_request('search', '_sid='+urlencode(id), lock);
};
@@ -5231,20 +5415,20 @@
};
// mark a mailbox as selected and set environment variable
- this.select_folder = function(name, old, prefix)
+ this.select_folder = function(name, prefix)
{
if (this.gui_objects.folderlist) {
var current_li, target_li;
- if ((current_li = this.get_folder_li(old, prefix))) {
- $(current_li).removeClass('selected').addClass('unfocused');
+ if ((current_li = $('li.selected', this.gui_objects.folderlist))) {
+ current_li.removeClass('selected').addClass('unfocused');
}
if ((target_li = this.get_folder_li(name, prefix))) {
$(target_li).removeClass('unfocused').addClass('selected');
}
// trigger event hook
- this.triggerEvent('selectfolder', { folder:name, old:old, prefix:prefix });
+ this.triggerEvent('selectfolder', { folder:name, prefix:prefix });
}
};
@@ -5324,8 +5508,12 @@
};
// replace content of row count display
- this.set_rowcount = function(text)
+ this.set_rowcount = function(text, mbox)
{
+ // #1487752
+ if (mbox && mbox != this.env.mailbox)
+ return false;
+
$(this.gui_objects.countdisplay).html(text);
// update page navigation buttons
@@ -5577,7 +5765,7 @@
var base = this.env.comm_path;
// overwrite task name
- if (query._action.match(/([a-z]+)\/([a-z-_.]+)/)) {
+ if (query._action.match(/([a-z]+)\/([a-z0-9-_.]+)/)) {
query._action = RegExp.$2;
base = base.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
}
@@ -5791,6 +5979,8 @@
this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
if (response.action == 'list' || response.action == 'search') {
+ this.enable_command('search-create', this.env.source == '');
+ this.enable_command('search-delete', this.env.search_id);
this.update_group_commands();
this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
}
@@ -6005,6 +6195,23 @@
}
};
+rcube_webmail.long_subject_title_ie = function(elem, indent)
+{
+ if (!elem.title) {
+ var $elem = $(elem),
+ txt = $.trim($elem.text()),
+ tmp = $('<span>').text(txt)
+ .css({'position': 'absolute', 'float': 'left', 'visibility': 'hidden',
+ 'font-size': $elem.css('font-size'), 'font-weight': $elem.css('font-weight')})
+ .appendTo($('body')),
+ w = tmp.width();
+
+ tmp.remove();
+ if (w + indent * 15 > $elem.width())
+ elem.title = txt;
+ }
+};
+
// copy event engine prototype
rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;
rcube_webmail.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener;
--
Gitblit v1.9.1