From 2c200021fdf9b5d1c73e39e7c46e7db1e4152e91 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 15 Nov 2010 04:26:24 -0500
Subject: [PATCH] - Fix focused elements aren't unfocused when clicking on the list (#1487123)
---
program/js/app.js | 1178 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 688 insertions(+), 490 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index b3097b7..7c38b14 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1,9 +1,9 @@
/*
+-----------------------------------------------------------------------+
- | RoundCube Webmail Client Script |
+ | Roundcube Webmail Client Script |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2010, RoundCube Dev, - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2010, Roundcube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
@@ -29,6 +29,7 @@
this.commands = {};
this.command_handlers = {};
this.onloads = [];
+ this.messages = {};
// create protected reference to myself
this.ref = 'rcmail';
@@ -36,7 +37,7 @@
// webmail client settings
this.dblclick_time = 500;
- this.message_time = 3000;
+ this.message_time = 1500;
this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');
@@ -56,7 +57,7 @@
$.ajaxSetup({
cache:false,
error:function(request, status, err){ ref.http_error(request, status, err); },
- beforeSend:function(xmlhttp){ xmlhttp.setRequestHeader('X-RoundCube-Request', ref.env.request_token); }
+ beforeSend:function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
});
// set environment variable(s)
@@ -147,8 +148,10 @@
this.init_buttons();
// tell parent window that this frame is loaded
- if (this.env.framed && parent.rcmail && parent.rcmail.set_busy)
- parent.rcmail.set_busy(false);
+ if (this.env.framed && parent.rcmail && parent.rcmail.set_busy) {
+ parent.rcmail.set_busy(false, null, parent.rcmail.env.frame_lock);
+ parent.rcmail.env.frame_lock = null;
+ }
// enable general commands
this.enable_command('logout', 'mail', 'addressbook', 'settings', true);
@@ -199,17 +202,17 @@
if (this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox)
this.set_alttext('delete', 'movemessagetotrash');
- this.env.message_commands = ['show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete',
- 'open', 'mark', 'edit', 'viewsource', 'download', 'print', 'load-attachment', 'load-headers'];
+ this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward',
+ 'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download',
+ 'print', 'load-attachment', 'load-headers'];
if (this.env.action=='show' || this.env.action=='preview') {
- this.enable_command(this.env.message_commands, true);
+ this.enable_command(this.env.message_commands, this.env.uid);
+ this.enable_command('reply-list', this.env.list_post);
- if (this.env.next_uid) {
- this.enable_command('nextmessage', 'lastmessage', true);
- }
- if (this.env.prev_uid) {
- this.enable_command('previousmessage', 'firstmessage', true);
+ if (this.env.action == 'show') {
+ this.http_request('pagenav', '_uid='+this.env.uid+'&_mbox='+urlencode(this.env.mailbox),
+ this.display_message('', 'loading'));
}
if (this.env.blockedobjects) {
@@ -225,17 +228,20 @@
}
}
else if (this.env.action == 'compose') {
- this.enable_command('add-attachment', 'send-attachment', 'remove-attachment', 'send', true);
+ this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'toggle-editor'];
+
+ if (this.env.drafts_mailbox)
+ this.env.compose_commands.push('savedraft')
+
+ this.enable_command(this.env.compose_commands, 'identities', true);
if (this.env.spellcheck) {
this.env.spellcheck.spelling_state_observer = function(s){ ref.set_spellcheck_state(s); };
+ this.env.compose_commands.push('spellcheck')
this.set_spellcheck_state('ready');
if ($("input[name='_is_html']").val() == '1')
this.display_spellcheck_controls(false);
}
-
- if (this.env.drafts_mailbox)
- this.enable_command('savedraft', true);
document.onmouseup = function(e){ return p.doc_mouse_up(e); };
@@ -243,7 +249,7 @@
this.init_messageform();
}
// show printing dialog
- else if (this.env.action == 'print')
+ else if (this.env.action == 'print' && this.env.uid)
window.print();
// get unread count for each mailbox
@@ -298,13 +304,27 @@
this.enable_command('group-create', this.env.address_sources[this.env.source].groups);
}
- if (this.env.cid)
+ if (this.env.cid) {
this.enable_command('show', 'edit', true);
+ // register handlers for group assignment via checkboxes
+ if (this.gui_objects.editform) {
+ $('input.groupmember').change(function(){
+ var cmd = this.checked ? 'group-addmembers' : 'group-delmembers';
+ ref.http_post(cmd, '_cid='+urlencode(ref.env.cid)
+ + '&_source='+urlencode(ref.env.source)
+ + '&_gid='+urlencode(this.value));
+ });
+ }
+ }
- if ((this.env.action=='add' || this.env.action=='edit') && this.gui_objects.editform)
+ if ((this.env.action=='add' || this.env.action=='edit') && this.gui_objects.editform) {
this.enable_command('save', true);
- else
+ $("input[type='text']").first().select();
+ }
+ else 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);
@@ -321,7 +341,7 @@
}
else if (this.env.action=='edit-identity' || this.env.action=='add-identity') {
this.enable_command('add', this.env.identities_level < 2);
- this.enable_command('save', 'delete', 'edit', true);
+ this.enable_command('save', 'delete', 'edit', 'toggle-editor', true);
}
else if (this.env.action=='folders')
this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', 'enable-threading', 'disable-threading', true);
@@ -359,8 +379,8 @@
$('#rcmlogintz').val(new Date().getTimezoneOffset() / -60);
// display 'loading' message on form submit
- $('form').submit(function () {
- rcmail.display_message(rcmail.get_label('loading'), 'loading', true);
+ $('form').submit(function () {
+ rcmail.display_message(rcmail.get_label('loading'), 'loading');
});
this.enable_command('login', true);
@@ -421,8 +441,7 @@
}
// check input before leaving compose step
- if (this.task=='mail' && this.env.action=='compose'
- && (command == 'list' || command == 'mail' || command == 'addressbook' || command == 'settings')) {
+ 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;
}
@@ -484,10 +503,9 @@
}
break;
- // misc list commands
case 'list':
if (this.task=='mail') {
- if (this.env.search_request<0 || (props != '' && (this.env.search_request && props != this.env.mailbox)))
+ if (!this.env.search_request || (props && props != this.env.mailbox))
this.reset_qsearch();
this.list_mailbox(props);
@@ -496,7 +514,7 @@
this.set_alttext('delete', this.env.mailbox != this.env.trash_mailbox ? 'movemessagetotrash' : 'deletemessage');
}
else if (this.task=='addressbook') {
- if (this.env.search_request<0 || (this.env.search_request && props != this.env.source))
+ if (!this.env.search_request || (props != this.env.source))
this.reset_qsearch();
this.list_contacts(props);
@@ -504,16 +522,9 @@
}
break;
-
- case 'listgroup':
- this.list_contacts(props.source, props.id);
- break;
-
-
case 'load-headers':
this.load_headers(obj);
break;
-
case 'sort':
var sort_order, sort_col = props;
@@ -557,7 +568,6 @@
this.purge_mailbox(this.env.mailbox);
break;
-
// common commands used in multiple tasks
case 'show':
if (this.task=='mail') {
@@ -597,7 +607,6 @@
}
break;
- case 'save-identity':
case 'save':
if (this.gui_objects.editform) {
var input_pagesize = $("input[name='_pagesize']");
@@ -725,10 +734,12 @@
case 'select-all':
this.select_all_mode = props ? false : true;
+ this.dummy_select = true; // prevent msg opening if there's only one msg on the list
if (props == 'invert')
this.message_list.invert_selection();
else
this.message_list.select_all(props == 'page' ? '' : props);
+ this.dummy_select = null;
break;
case 'select-none':
@@ -844,10 +855,12 @@
if (!this.env.drafts_mailbox || this.cmp_hash == this.compose_field_hash())
break;
- this.set_busy(true, 'savingmessage');
- var form = this.gui_objects.messageform;
+ var form = this.gui_objects.messageform,
+ msgid = this.set_busy(true, 'savingmessage');
+
form.target = "savetarget";
form._draft.value = '1';
+ form.action = this.add_url(form.action, '_unlock', msgid);
form.submit();
break;
@@ -862,18 +875,17 @@
self.clearTimeout(this.save_timer);
// all checks passed, send message
- this.set_busy(true, 'sendingmessage');
- var form = this.gui_objects.messageform;
+ var form = this.gui_objects.messageform,
+ msgid = this.set_busy(true, 'sendingmessage');
+
form.target = 'savetarget';
form._draft.value = '';
+ form.action = this.add_url(form.action, '_unlock', msgid);
form.submit();
// clear timeout (sending could take longer)
clearTimeout(this.request_timer);
break;
-
- case 'add-attachment':
- this.show_attachment_form(true);
case 'send-attachment':
// Reset the auto-save timer
@@ -882,19 +894,24 @@
this.upload_file(props)
break;
- case 'remove-attachment':
- this.remove_attachment(props);
- break;
-
case 'insert-sig':
this.change_identity($("[name='_from']")[0], true);
break;
case 'reply-all':
+ case 'reply-list':
case 'reply':
var uid;
- if (uid = this.get_single_uid())
- this.goto_url('compose', '_reply_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(command=='reply-all' ? '&_all=1' : ''), true);
+ if (uid = this.get_single_uid()) {
+ var url = '_reply_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
+ if (command == 'reply-all')
+ // do reply-list, when list is detected and popup menu wasn't used
+ url += '&_all=' + (!props && this.commands['reply-list'] ? 'list' : 'all');
+ else if (command == 'reply-list')
+ url += '&_all=list';
+
+ this.goto_url('compose', url, true);
+ }
break;
case 'forward':
@@ -930,10 +947,6 @@
this.goto_url('viewsource', '&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+'&_save=1');
break;
- case 'add-contact':
- this.add_contact(props);
- break;
-
// quicksearch
case 'search':
if (!props && this.gui_objects.qsearchbox)
@@ -954,16 +967,8 @@
this.list_contacts(this.env.source, this.env.group);
break;
- case 'group-create':
- this.add_contact_group(props)
- break;
-
- case 'group-rename':
- this.rename_contact_group();
- break;
-
- case 'group-delete':
- this.delete_contact_group();
+ case 'listgroup':
+ this.list_contacts(props.source, props.id);
break;
case 'import':
@@ -991,56 +996,25 @@
}
break;
- // collapse/expand folder
- case 'collapse-folder':
- if (props)
- this.collapse_folder(props);
- break;
-
// user settings commands
case 'preferences':
this.goto_url('');
break;
case 'identities':
- this.goto_url('identities');
+ this.goto_url('settings/identities');
break;
-
- case 'delete-identity':
- this.delete_identity();
case 'folders':
- this.goto_url('folders');
+ this.goto_url('settings/folders');
break;
- case 'subscribe':
- this.subscribe_folder(props);
+ // unified command call (command name == function name)
+ default:
+ var func = command.replace(/-/g, '_');
+ if (this[func] && typeof this[func] == 'function')
+ this[func](props);
break;
-
- case 'unsubscribe':
- this.unsubscribe_folder(props);
- break;
-
- case 'enable-threading':
- this.enable_threading(props);
- break;
-
- case 'disable-threading':
- this.disable_threading(props);
- break;
-
- case 'create-folder':
- this.create_folder(props);
- break;
-
- case 'rename-folder':
- this.rename_folder(props);
- break;
-
- case 'delete-folder':
- this.delete_folder(props);
- break;
-
}
this.triggerEvent('after'+command, props);
@@ -1071,17 +1045,18 @@
};
// lock/unlock interface
- this.set_busy = function(a, message)
+ this.set_busy = function(a, message, id)
{
if (a && message) {
var msg = this.get_label(message);
if (msg == message)
msg = 'Loading...';
- this.display_message(msg, 'loading', true);
+ id = this.display_message(msg, 'loading');
}
- else if (!a)
- this.hide_message();
+ else if (!a && id) {
+ this.hide_message(id);
+ }
this.busy = a;
//document.body.style.cursor = a ? 'wait' : 'default';
@@ -1096,6 +1071,8 @@
// set timer for requests
if (a && this.env.request_timeout)
this.request_timer = window.setTimeout(function(){ ref.request_timed_out(); }, this.env.request_timeout * 1000);
+
+ return id;
};
// return a localized string
@@ -1150,6 +1127,26 @@
location.href = this.env.comm_path;
};
+ // Add variable to GET string, replace old value if exists
+ this.add_url = function(url, name, value)
+ {
+ value = urlencode(value);
+
+ if (/(\?.*)$/.test(url)) {
+ var urldata = RegExp.$1,
+ datax = RegExp('((\\?|&)'+RegExp.escape(name)+'=[^&]*)');
+
+ if (datax.test(urldata)) {
+ urldata = urldata.replace(datax, RegExp.$2 + name + '=' + value);
+ }
+ else
+ urldata += '&' + name + '=' + value
+
+ return url.replace(/(\?.*)$/, urldata);
+ }
+ else
+ return url + '?' + name + '=' + value;
+ };
/*********************************************************/
/********* event handling methods *********/
@@ -1192,8 +1189,7 @@
clearTimeout(this.preview_read_timer);
// save folderlist and folders location/sizes for droptarget calculation in drag_move()
- if (this.gui_objects.folderlist && model)
- {
+ if (this.gui_objects.folderlist && model) {
this.initialBodyScrollTop = bw.ie ? 0 : window.pageYOffset;
this.initialListScrollTop = this.gui_objects.folderlist.parentNode.scrollTop;
@@ -1243,7 +1239,11 @@
var boffset = bw.ie ? -document.documentElement.scrollTop : this.initialBodyScrollTop;
var moffset = this.initialListScrollTop-this.gui_objects.folderlist.parentNode.scrollTop;
var toffset = -moffset-boffset;
- var li, div, pos, mouse;
+ var li, div, pos, mouse, check, oldclass,
+ layerclass = 'draglayernormal';
+
+ if (this.contact_list && this.contact_list.draglayer)
+ oldclass = this.contact_list.draglayer.attr('class');
mouse = rcube_event.get_mouse_pos(e);
pos = this.env.folderlist_coords;
@@ -1256,6 +1256,8 @@
this.env.folder_coords[this.env.last_folder_target].on = 0;
this.env.last_folder_target = null;
}
+ if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
+ this.contact_list.draglayer.attr('class', layerclass);
return;
}
@@ -1263,7 +1265,7 @@
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){
- if (this.check_droptarget(k)) {
+ if ((check = this.check_droptarget(k))) {
li = this.get_folder_li(k);
div = $(li.getElementsByTagName('div')[0]);
@@ -1286,6 +1288,7 @@
$(li).addClass('droptarget');
this.env.folder_coords[k].on = 1;
this.env.last_folder_target = k;
+ layerclass = 'draglayer' + (check > 1 ? 'copy' : 'normal');
} else { // Clear target, otherwise drag end will trigger move into last valid droptarget
this.env.last_folder_target = null;
}
@@ -1295,6 +1298,9 @@
this.env.folder_coords[k].on = 0;
}
}
+
+ if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
+ this.contact_list.draglayer.attr('class', layerclass);
}
};
@@ -1405,9 +1411,16 @@
var selected = list.get_single_selection() != null;
this.enable_command(this.env.message_commands, selected);
- // Hide certain command buttons when Drafts folder is selected
- if (selected && this.env.mailbox == this.env.drafts_mailbox) {
- this.enable_command('reply', 'reply-all', 'forward', false);
+ if (selected) {
+ // Hide certain command buttons when Drafts folder is selected
+ if (this.env.mailbox == this.env.drafts_mailbox)
+ this.enable_command('reply', 'reply-all', 'reply-list', 'forward', false);
+ // Disable reply-list when List-Post header is not set
+ else {
+ var msg = this.env.messages[list.get_single_selection()];
+ if (!msg.ml)
+ this.enable_command('reply-list', false);
+ }
}
// Multi-message commands
this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
@@ -1417,7 +1430,7 @@
this.select_all_mode = false;
// start timer for message preview (wait for double click)
- if (selected && this.env.contentframe && !list.multi_selecting)
+ if (selected && this.env.contentframe && !list.multi_selecting && !this.dummy_select)
this.preview_timer = window.setTimeout(function(){ ref.msglist_get_preview(); }, 200);
else if (this.env.contentframe)
this.show_contentframe(false);
@@ -1485,13 +1498,13 @@
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/, '');
@@ -1501,21 +1514,35 @@
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 });
+ if ((found = $.inArray('subject', this.env.coltypes)) >= 0)
+ this.set_env('subject_col', found);
+
+ this.http_post('save-pref', { '_name':'list_cols', '_value':this.env.coltypes, '_session':'list_attrib/columns' });
};
this.check_droptarget = function(id)
{
+ var allow = false, copy = false;
+
if (this.task == 'mail')
- return (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
- 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));
+ allow = (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
else if (this.task == 'settings')
- return (id != this.env.folder);
+ allow = (id != this.env.folder);
+ else if (this.task == 'addressbook') {
+ if (id != this.env.source && this.env.contactfolders[id]) {
+ if (this.env.contactfolders[id].type == 'group') {
+ var target_abook = this.env.contactfolders[id].source;
+ allow = this.env.contactfolders[id].id != this.env.group && !this.env.contactfolders[target_abook].readonly;
+ copy = target_abook != this.env.source;
+ }
+ else {
+ allow = !this.env.contactfolders[id].readonly;
+ copy = true;
+ }
+ }
+ }
+
+ return allow ? (copy ? 2 : 1) : 0;
};
@@ -1525,21 +1552,28 @@
this.init_message_row = function(row)
{
- var expando, self = this, uid = row.uid;
+ var expando, self = this, uid = row.uid,
+ status_icon = (this.env.status_col != null ? 'status' : 'msg') + 'icn' + row.uid;
if (uid && this.env.messages[uid])
$.extend(row, this.env.messages[uid]);
- // set eventhandler to message icon
- if (this.env.subject_col != null && (row.icon = document.getElementById('msgicn'+row.uid))) {
+ // set eventhandler to status icon
+ if (row.icon = document.getElementById(status_icon)) {
row.icon._row = row.obj;
- row.icon.onmousedown = function(e) { self.command('toggle_status', this); };
+ row.icon.onmousedown = function(e) { self.command('toggle_status', this); rcube_event.cancel(e); };
}
+ // save message icon position too
+ if (this.env.status_col != null)
+ row.msgicon = document.getElementById('msgicn'+row.uid);
+ else
+ row.msgicon = row.icon;
+
// set eventhandler to flag icon, if icon found
- if (this.env.flagged_col != null && (row.flagged_icon = document.getElementById('flaggedicn'+row.uid))) {
- row.flagged_icon._row = row.obj;
- row.flagged_icon.onmousedown = function(e) { self.command('toggle_flag', this); };
+ if (this.env.flagged_col != null && (row.flagicon = document.getElementById('flagicn'+row.uid))) {
+ row.flagicon._row = row.obj;
+ row.flagicon.onmousedown = function(e) { self.command('toggle_flag', this); rcube_event.cancel(e); };
}
if (!row.depth && row.has_children && (expando = document.getElementById('rcmexpando'+row.uid))) {
@@ -1570,10 +1604,14 @@
depth: flags.depth?flags.depth:0,
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)
+ selected: this.select_all_mode || this.message_list.in_selection(uid),
+ ml: flags.ml?1:0,
+ ctype: flags.ctype,
+ // flags from plugins
+ flags: flags.extra_flags
});
- var c, tree = expando = '',
+ var c, html, tree = expando = '',
list = this.message_list,
rows = list.rows,
tbody = this.gui_objects.messagelist.tBodies[0],
@@ -1594,22 +1632,21 @@
row.id = 'rcmrow'+uid;
row.className = css_class;
- // message status icon
- var icon = this.env.messageicon;
- if (!flags.unread && flags.unread_children > 0 && this.env.unreadchildrenicon)
- icon = this.env.unreadchildrenicon;
- else if (flags.deleted && this.env.deletedicon)
- icon = this.env.deletedicon;
- else if (flags.replied && this.env.repliedicon) {
- if (flags.forwarded && this.env.forwardedrepliedicon)
- icon = this.env.forwardedrepliedicon;
- else
- icon = this.env.repliedicon;
+ // message status icons
+ css_class = 'msgicon';
+ if (this.env.status_col === null) {
+ css_class += ' status';
+ if (flags.deleted)
+ css_class += ' deleted';
+ else if (flags.unread)
+ css_class += ' unread';
+ else if (flags.unread_children > 0)
+ css_class += ' unreadchildren';
}
- else if (flags.forwarded && this.env.forwardedicon)
- icon = this.env.forwardedicon;
- else if(flags.unread && this.env.unreadicon)
- icon = this.env.unreadicon;
+ if (flags.replied)
+ css_class += ' replied';
+ if (flags.forwarded)
+ css_class += ' forwarded';
// update selection
if (message.selected && !list.in_selection(uid))
@@ -1643,7 +1680,7 @@
expando = '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '"> </div>';
}
- tree += icon ? '<img id="msgicn'+uid+'" src="'+icon+'" alt="" class="msgicon" />' : '';
+ tree += '<span id="msgicn'+uid+'" class="'+css_class+'"> </span>';
// build subject link
if (!bw.ie && cols.subject) {
@@ -1659,17 +1696,31 @@
col = document.createElement('td');
col.className = String(c).toLowerCase();
- var html;
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="" />';
+ css_class = (flags.flagged ? 'flagged' : 'unflagged');
+ html = '<span id="flagicn'+uid+'" class="'+css_class+'"> </span>';
+ }
+ else if (c == 'attachment') {
+ if (/application\/|multipart\/m/.test(flags.ctype))
+ html = '<span class="attachment"> </span>';
+ else if (/multipart\/report/.test(flags.ctype))
+ html = '<span class="report"> </span>';
+ else
+ html = ' ';
+ }
+ else if (c == 'status') {
+ if (flags.deleted)
+ css_class = 'deleted';
+ else if (flags.unread)
+ css_class = 'unread';
+ else if (flags.unread_children > 0)
+ css_class = 'unreadchildren';
+ else
+ css_class = 'msgicon';
+ html = '<span id="statusicn'+uid+'" class="'+css_class+'"> </span>';
}
else if (c == 'threads')
html = expando;
- else if (c == 'attachment')
- html = flags.attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : ' ';
else if (c == 'subject')
html = tree + cols[c];
else
@@ -1705,7 +1756,7 @@
{
var update, add_url = '';
- if (sort_col === null)
+ if (typeof sort_col == 'undefined')
sort_col = this.env.sort_col;
if (!sort_order)
sort_order = this.env.sort_order;
@@ -1751,27 +1802,28 @@
if (!id)
return;
- var add_url = '',
- target = window,
- action = preview ? 'preview': 'show';
+ var target = window,
+ action = preview ? 'preview': 'show',
+ url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox);
if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
target = window.frames[this.env.contentframe];
- add_url = '&_framed=1';
+ url += '&_framed=1';
}
if (safe)
- add_url = '&_safe=1';
+ url += '&_safe=1';
// also send search request to get the right messages
if (this.env.search_request)
- add_url += '&_search='+this.env.search_request;
+ url += '&_search='+this.env.search_request;
- 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');
+ if (!this.env.frame_lock) {
+ (parent.rcmail ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
+ }
target.location.href = this.env.comm_path+url;
// mark as read and change mbox unread counter
@@ -1784,7 +1836,7 @@
ref.set_unread_count(ref.env.mailbox, ref.env.unread_counts[ref.env.mailbox], ref.env.mailbox == 'INBOX');
}
if (ref.env.preview_pane_mark_read > 0)
- ref.http_post('mark', '_uid='+id+'&_flag=read');
+ ref.http_post('mark', '_uid='+id+'&_flag=read&_quiet=1');
}, this.env.preview_pane_mark_read * 1000);
}
}
@@ -1792,18 +1844,18 @@
this.show_contentframe = function(show)
{
- var frm;
+ var frm, win;
if (this.env.contentframe && (frm = $('#'+this.env.contentframe)) && frm.length) {
- if (!show && window.frames[this.env.contentframe]) {
- if (window.frames[this.env.contentframe].location.href.indexOf(this.env.blankpage)<0)
- window.frames[this.env.contentframe].location.href = this.env.blankpage;
+ if (!show && (win = window.frames[this.env.contentframe])) {
+ if (win.location && win.location.href.indexOf(this.env.blankpage)<0)
+ win.location.href = this.env.blankpage;
}
else if (!bw.safari && !bw.konq)
frm[show ? 'show' : 'hide']();
}
if (!show && this.busy)
- this.set_busy(false);
+ this.set_busy(false, null, this.env.frame_lock);
};
// list a specific page
@@ -1811,11 +1863,11 @@
{
if (page == 'next')
page = this.env.current_page+1;
- if (page == 'last')
+ else if (page == 'last')
page = this.env.pagecount;
- if (page == 'prev' && this.env.current_page > 1)
+ else if (page == 'prev' && this.env.current_page > 1)
page = this.env.current_page-1;
- if (page == 'first' && this.env.current_page > 1)
+ else if (page == 'first' && this.env.current_page > 1)
page = 1;
if (page > 0 && page <= this.env.pagecount) {
@@ -1824,25 +1876,25 @@
if (this.task == 'mail')
this.list_mailbox(this.env.mailbox, page);
else if (this.task == 'addressbook')
- this.list_contacts(this.env.source, null, page);
+ this.list_contacts(this.env.source, this.env.group, page);
}
};
// list messages of a specific mailbox using filter
this.filter_mailbox = function(filter)
{
- var search;
+ var search, lock = this.set_busy(true, 'searching');
+
if (this.gui_objects.qsearchbox)
search = this.gui_objects.qsearchbox.value;
- this.message_list.clear();
+ this.clear_message_list();
// 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);
+ + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), lock);
};
// list messages of a specific mailbox
@@ -1869,17 +1921,14 @@
page = 1;
this.env.current_page = page;
this.select_all_mode = false;
- this.show_contentframe(false);
}
+
+ // unselect selected messages and clear the list and message data
+ this.clear_message_list();
if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
url += '&_refresh=1';
- // unselect selected messages
- this.last_selected = 0;
- if (this.message_list) {
- this.message_list.clear_selection();
- }
this.select_folder(mbox, this.env.mailbox);
this.env.mailbox = mbox;
@@ -1901,6 +1950,16 @@
}
};
+ this.clear_message_list = function()
+ {
+ this.env.messages = {};
+ this.last_selected = 0;
+
+ this.show_contentframe(false);
+ if (this.message_list)
+ this.message_list.clear(true);
+ };
+
// send remote request to load message list
this.list_mailbox_remote = function(mbox, page, add_url)
{
@@ -1908,9 +1967,9 @@
this.message_list.clear();
// send request to server
- var url = '_mbox='+urlencode(mbox)+(page ? '&_page='+page : '');
- this.set_busy(true, 'loading');
- this.http_request('list', url+add_url, true);
+ var url = '_mbox='+urlencode(mbox)+(page ? '&_page='+page : ''),
+ lock = this.set_busy(true, 'loading');
+ this.http_request('list', url+add_url, lock);
};
// removes messages that doesn't exists from list selection array
@@ -2181,88 +2240,95 @@
// set message icon
this.set_message_icon = function(uid)
{
- var icn_src,
- rows = this.message_list.rows;
+ var css_class,
+ row = this.message_list.rows[uid];
- if (!rows[uid])
+ if (!row)
return false;
- if (!rows[uid].unread && rows[uid].unread_children && this.env.unreadchildrenicon) {
- icn_src = this.env.unreadchildrenicon;
+
+ if (row.icon) {
+ css_class = 'msgicon';
+ if (row.deleted)
+ css_class += ' deleted';
+ else if (row.unread)
+ css_class += ' unread';
+ else if (row.unread_children)
+ css_class += ' unreadchildren';
+ if (row.msgicon == row.icon) {
+ if (row.replied)
+ css_class += ' replied';
+ if (row.forwarded)
+ css_class += ' forwarded';
+ css_class += ' status';
+ }
+
+ row.icon.className = css_class;
}
- else if (rows[uid].deleted && this.env.deletedicon)
- icn_src = this.env.deletedicon;
- else if (rows[uid].replied && this.env.repliedicon) {
- if (rows[uid].forwarded && this.env.forwardedrepliedicon)
- icn_src = this.env.forwardedrepliedicon;
- else
- icn_src = this.env.repliedicon;
+
+ if (row.msgicon && row.msgicon != row.icon) {
+ css_class = 'msgicon';
+ if (!row.unread && row.unread_children)
+ css_class += ' unreadchildren';
+ if (row.replied)
+ css_class += ' replied';
+ if (row.forwarded)
+ css_class += ' forwarded';
+
+ row.msgicon.className = css_class;
}
- else if (rows[uid].forwarded && this.env.forwardedicon)
- icn_src = this.env.forwardedicon;
- else if (rows[uid].unread && this.env.unreadicon)
- icn_src = this.env.unreadicon;
- else if (this.env.messageicon)
- icn_src = this.env.messageicon;
- if (icn_src && rows[uid].icon)
- rows[uid].icon.src = icn_src;
-
- icn_src = '';
-
- if (rows[uid].flagged && this.env.flaggedicon)
- icn_src = this.env.flaggedicon;
- else if (!rows[uid].flagged && this.env.unflaggedicon)
- icn_src = this.env.unflaggedicon;
- if (rows[uid].flagged_icon && icn_src)
- rows[uid].flagged_icon.src = icn_src;
+ if (row.flagicon) {
+ css_class = (row.flagged ? 'flagged' : 'unflagged');
+ row.flagicon.className = css_class;
+ }
};
// set message status
this.set_message_status = function(uid, flag, status)
{
- var rows = this.message_list.rows;
+ var row = this.message_list.rows[uid];
- if (!rows[uid]) return false;
+ if (!row)
+ return false;
if (flag == 'unread')
- rows[uid].unread = status;
+ row.unread = status;
else if(flag == 'deleted')
- rows[uid].deleted = status;
+ row.deleted = status;
else if (flag == 'replied')
- rows[uid].replied = status;
+ row.replied = status;
else if (flag == 'forwarded')
- rows[uid].forwarded = status;
+ row.forwarded = status;
else if (flag == 'flagged')
- rows[uid].flagged = status;
-
-// this.env.messages[uid] = rows[uid];
+ row.flagged = status;
};
// set message row status, class and icon
this.set_message = function(uid, flag, status)
{
- var rows = this.message_list.rows;
+ var row = this.message_list.rows[uid];
- if (!rows[uid]) return false;
+ if (!row)
+ return false;
if (flag)
this.set_message_status(uid, flag, status);
- var rowobj = $(rows[uid].obj);
+ var rowobj = $(row.obj);
- if (rows[uid].unread && !rowobj.hasClass('unread'))
+ if (row.unread && !rowobj.hasClass('unread'))
rowobj.addClass('unread');
- else if (!rows[uid].unread && rowobj.hasClass('unread'))
+ else if (!row.unread && rowobj.hasClass('unread'))
rowobj.removeClass('unread');
- if (rows[uid].deleted && !rowobj.hasClass('deleted'))
+ if (row.deleted && !rowobj.hasClass('deleted'))
rowobj.addClass('deleted');
- else if (!rows[uid].deleted && rowobj.hasClass('deleted'))
+ else if (!row.deleted && rowobj.hasClass('deleted'))
rowobj.removeClass('deleted');
- if (rows[uid].flagged && !rowobj.hasClass('flagged'))
+ if (row.flagged && !rowobj.hasClass('flagged'))
rowobj.addClass('flagged');
- else if (!rows[uid].flagged && rowobj.hasClass('flagged'))
+ else if (!row.flagged && rowobj.hasClass('flagged'))
rowobj.removeClass('flagged');
this.set_unread_children(uid);
@@ -2294,6 +2360,7 @@
return;
var a_uids = [],
+ lock = this.display_message(this.get_label('copyingmessage'), 'loading'),
add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
if (this.env.uid)
@@ -2306,7 +2373,7 @@
}
// send request to server
- this.http_post('copy', '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, false);
+ this.http_post('copy', '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
};
// move selected messages to the specified mailbox
@@ -2323,9 +2390,8 @@
var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
// show wait message
- if (this.env.action=='show') {
- lock = true;
- this.set_busy(true, 'movingmessage');
+ if (this.env.action == 'show') {
+ lock = this.set_busy(true, 'movingmessage');
}
else
this.show_contentframe(false);
@@ -2358,7 +2424,7 @@
return false;
}
// if there isn't a defined trash mailbox or we are in it
- else if (!this.env.trash_mailbox || this.env.mailbox == this.env.trash_mailbox)
+ else if (!this.env.trash_mailbox || this.env.mailbox == this.env.trash_mailbox)
this.permanently_remove_messages();
// if there is a trash mailbox defined and we're not currently in it
else {
@@ -2389,7 +2455,7 @@
// @private
this._with_selected_messages = function(action, lock, add_url)
{
- var a_uids = [], count = 0;
+ var a_uids = [], count = 0, msg;
if (this.env.uid)
a_uids[0] = this.env.uid;
@@ -2419,7 +2485,7 @@
}
}
- // also send search request to get the right messages
+ // also send search request to get the right messages
if (this.env.search_request)
add_url += '&_search='+this.env.search_request;
@@ -2433,6 +2499,11 @@
this.delete_excessive_thread_rows();
add_url += '&_uid='+this.uids_to_list(a_uids);
+
+ if (!lock) {
+ msg = action == 'moveto' ? 'movingmessage' : 'deletingmessage';
+ lock = this.display_message(this.get_label(msg), 'loading');
+ }
// send request to server
this.http_post(action, '_mbox='+urlencode(this.env.mailbox)+add_url, lock);
@@ -2497,13 +2568,14 @@
for (var i=0; i<a_uids.length; i++)
this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));
- var url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag;
+ var url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag,
+ lock = this.display_message(this.get_label('markingmessage'), 'loading');
// 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);
+ this.http_post('mark', url, lock);
for (var i=0; i<a_uids.length; i++)
this.update_thread_root(a_uids[i], flag);
@@ -2516,13 +2588,14 @@
for (var i=0; i<a_uids.length; i++)
this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));
- var url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag;
+ var url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag,
+ lock = this.display_message(this.get_label('markingmessage'), 'loading');
// 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);
+ this.http_post('mark', url, lock);
};
// mark all message rows as deleted/undeleted
@@ -2561,13 +2634,14 @@
for (var i=0, len=a_uids.length; i<len; i++)
this.set_message(a_uids[i], 'deleted', false);
- var url = '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete';
+ var url = '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete',
+ lock = this.display_message(this.get_label('markingmessage'), 'loading');
// 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);
+ this.http_post('mark', url, lock);
return true;
};
@@ -2604,7 +2678,8 @@
this.delete_excessive_thread_rows();
}
- add_url = '&_from='+(this.env.action ? this.env.action : '');
+ add_url = '&_from='+(this.env.action ? this.env.action : ''),
+ lock = this.display_message(this.get_label('markingmessage'), 'loading');
// ??
if (r_uids.length)
@@ -2619,8 +2694,8 @@
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;
+ this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=delete'+add_url, lock);
+ return true;
};
// flag as read without mark request (called from backend)
@@ -2658,8 +2733,7 @@
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
- lock = true;
- this.set_busy(true, 'loading');
+ lock = this.set_busy(true, 'loading');
add_url = '&_reload=1';
}
@@ -2678,8 +2752,7 @@
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
- lock = true;
- this.set_busy(true, 'loading');
+ lock = this.set_busy(true, 'loading');
add_url = '&_reload=1';
}
@@ -2728,17 +2801,18 @@
if (!this.gui_objects.messageform)
return false;
- //this.messageform = this.gui_objects.messageform;
- var input_from = $("[name='_from']");
- var input_to = $("[name='_to']");
- var input_subject = $("input[name='_subject']");
- var input_message = $("[name='_message']").get(0);
- var html_mode = $("input[name='_is_html']").val() == '1';
+ var input_from = $("[name='_from']"),
+ input_to = $("[name='_to']"),
+ input_subject = $("input[name='_subject']"),
+ input_message = $("[name='_message']").get(0),
+ html_mode = $("input[name='_is_html']").val() == '1',
+ ac_fields = ['cc', 'bcc', 'replyto', 'mailreplyto', 'mailfollowupto'];
// init live search events
this.init_address_input_events(input_to);
- this.init_address_input_events($("[name='_cc']"));
- this.init_address_input_events($("[name='_bcc']"));
+ for (var i in ac_fields) {
+ this.init_address_input_events($("[name='_"+ac_fields[i]+"']"));
+ }
if (!html_mode) {
this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
@@ -2767,21 +2841,20 @@
this.init_address_input_events = function(obj)
{
- var handler = function(e){ return ref.ksearch_keypress(e,this); };
- obj.bind((bw.safari || bw.ie ? 'keydown' : 'keypress'), handler);
- obj.attr('autocomplete', 'off');
+ obj[bw.ie || bw.safari || bw.chrome ? 'keydown' : 'keypress'](function(e){ return ref.ksearch_keydown(e, this); })
+ .attr('autocomplete', 'off');
};
// checks the input fields before sending a message
this.check_compose_input = function()
{
// check input fields
- var input_to = $("[name='_to']");
- var input_cc = $("[name='_cc']");
- var input_bcc = $("[name='_bcc']");
- var input_from = $("[name='_from']");
- var input_subject = $("[name='_subject']");
- var input_message = $("[name='_message']");
+ var ed, input_to = $("[name='_to']"),
+ input_cc = $("[name='_cc']"),
+ input_bcc = $("[name='_bcc']"),
+ input_from = $("[name='_from']"),
+ input_subject = $("[name='_subject']"),
+ input_message = $("[name='_message']");
// check sender (if have no identities)
if (input_from.attr('type') == 'text' && !rcube_check_email(input_from.val(), true)) {
@@ -2819,33 +2892,63 @@
input_subject.val((subject ? subject : this.get_label('nosubject')));
}
- // check for empty body
- if ((!window.tinyMCE || !tinyMCE.get(this.env.composebody))
- && input_message.val() == '' && !confirm(this.get_label('nobodywarning'))) {
- input_message.focus();
- return false;
- }
- else if (window.tinyMCE && tinyMCE.get(this.env.composebody)
- && !tinyMCE.get(this.env.composebody).getContent()
- && !confirm(this.get_label('nobodywarning'))) {
- tinyMCE.get(this.env.composebody).focus();
- return false;
- }
-
// Apply spellcheck changes if spell checker is active
this.stop_spellchecking();
- // move body from html editor to textarea (just to be sure, #1485860)
- if (window.tinyMCE && tinyMCE.get(this.env.composebody))
+ if (window.tinyMCE)
+ ed = tinyMCE.get(this.env.composebody);
+
+ // check for empty body
+ if (!ed && input_message.val() == '' && !confirm(this.get_label('nobodywarning'))) {
+ input_message.focus();
+ return false;
+ }
+ else if (ed) {
+ if (!ed.getContent() && !confirm(this.get_label('nobodywarning'))) {
+ ed.focus();
+ return false;
+ }
+ // move body from html editor to textarea (just to be sure, #1485860)
tinyMCE.triggerSave();
+ }
+
+ return true;
+ };
+
+ this.toggle_editor = function(props)
+ {
+ if (props.mode == 'html') {
+ this.display_spellcheck_controls(false);
+ this.plain2html($('#'+props.id).val(), props.id);
+ tinyMCE.execCommand('mceAddControl', false, props.id);
+ }
+ else {
+ var thisMCE = tinyMCE.get(props.id), existingHtml;
+ if (thisMCE.plugins.spellchecker && thisMCE.plugins.spellchecker.active)
+ thisMCE.execCommand('mceSpellCheck', false);
+
+ if (existingHtml = thisMCE.getContent()) {
+ if (!confirm(this.get_label('editorwarning'))) {
+ return false;
+ }
+ this.html2plain(existingHtml, props.id);
+ }
+ tinyMCE.execCommand('mceRemoveControl', false, props.id);
+ this.display_spellcheck_controls(true);
+ }
return true;
};
this.stop_spellchecking = function()
{
- if (this.env.spellcheck && !this.spellcheck_ready) {
- $(this.env.spellcheck.spell_span).trigger('click');
+ var ed;
+ if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody))) {
+ if (ed.plugins.spellchecker && ed.plugins.spellchecker.active)
+ ed.execCommand('mceSpellCheck');
+ }
+ else if ((ed = this.env.spellcheck) && !this.spellcheck_ready) {
+ $(ed.spell_span).trigger('click');
this.set_spellcheck_state('ready');
}
};
@@ -2932,8 +3035,10 @@
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])
+ if (this.env.signatures && this.env.signatures[id]) {
this.enable_command('insert-sig', true);
+ this.env.compose_commands.push('insert-sig');
+ }
else
this.enable_command('insert-sig', false);
@@ -3043,32 +3148,6 @@
return true;
};
- this.show_attachment_form = function(a)
- {
- if (!this.gui_objects.uploadbox)
- return false;
-
- var elm, list;
- if (elm = this.gui_objects.uploadbox) {
- if (a && (list = this.gui_objects.attachmentlist)) {
- var pos = $(list).offset();
- elm.style.top = (pos.top + list.offsetHeight + 10) + 'px';
- elm.style.left = pos.left + 'px';
- }
-
- $(elm).toggle();
- }
-
- // clear upload form
- try {
- if (!a && this.gui_objects.attachmentform != this.gui_objects.messageform)
- this.gui_objects.attachmentform.reset();
- }
- catch(e){} // ignore errors
-
- return true;
- };
-
// upload attachment file
this.upload_file = function(form)
{
@@ -3131,8 +3210,6 @@
form.setAttribute('enctype', 'multipart/form-data');
form.submit();
- // hide upload form
- this.show_attachment_form(false);
// display upload indicator and cancel button
var content = this.get_label('uploading');
if (this.env.loadingicon)
@@ -3220,7 +3297,7 @@
if (value != '') {
var addurl = '';
if (this.message_list) {
- this.message_list.clear();
+ this.clear_message_list();
if (this.env.search_mods) {
var mods = this.env.search_mods[this.env.mailbox] ? this.env.search_mods[this.env.mailbox] : this.env.search_mods['*'];
if (mods) {
@@ -3240,12 +3317,12 @@
// reset vars
this.env.current_page = 1;
- this.set_busy(true, 'searching');
+ var lock = 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) : '')
+ (this.env.group ? '&_gid='+urlencode(this.env.group) : '')
- + (addurl ? addurl : ''), true);
+ + (addurl ? addurl : ''), lock);
}
return true;
};
@@ -3262,8 +3339,9 @@
this.sent_successfully = function(type, msg)
{
- this.list_mailbox();
- this.display_message(msg, type, true);
+ this.display_message(msg, type);
+ // before redirect we need to wait some time for Chrome (#1486177)
+ window.setTimeout(function(){ ref.list_mailbox(); }, 500);
};
@@ -3272,7 +3350,7 @@
/*********************************************************/
// handler for keyboard events on address-fields
- this.ksearch_keypress = function(e, obj)
+ this.ksearch_keydown = function(e, obj)
{
if (this.ksearch_timer)
clearTimeout(this.ksearch_timer);
@@ -3299,10 +3377,10 @@
return rcube_event.cancel(e);
case 9: // tab
- if(mod == SHIFT_KEY)
+ if (mod == SHIFT_KEY)
break;
- case 13: // enter
+ case 13: // enter
if (this.ksearch_selected===null || !this.ksearch_input || !this.ksearch_value)
break;
@@ -3348,14 +3426,14 @@
return;
// get cursor pos
- var inp_value = this.ksearch_input.value;
- var cpos = this.get_caret_pos(this.ksearch_input);
- var p = inp_value.lastIndexOf(this.ksearch_value, cpos);
+ var inp_value = this.ksearch_input.value,
+ cpos = this.get_caret_pos(this.ksearch_input),
+ p = inp_value.lastIndexOf(this.ksearch_value, cpos),
+ insert = '',
- // replace search string with full address
- var pre = this.ksearch_input.value.substring(0, p);
- var end = this.ksearch_input.value.substring(p+this.ksearch_value.length, this.ksearch_input.value.length);
- var insert = '';
+ // replace search string with full address
+ pre = inp_value.substring(0, p),
+ end = inp_value.substring(p+this.ksearch_value.length, inp_value.length);
// insert all members of a group
if (typeof this.env.contacts[id] == 'object' && this.env.contacts[id].id) {
@@ -3387,6 +3465,7 @@
this.ksearch_get_results = function()
{
var inp_value = this.ksearch_input ? this.ksearch_input.value : null;
+
if (inp_value === null)
return;
@@ -3394,16 +3473,29 @@
this.ksearch_pane.hide();
// get string from current cursor pos to last comma
- var cpos = this.get_caret_pos(this.ksearch_input);
- var p = inp_value.lastIndexOf(',', cpos-1);
- var q = inp_value.substring(p+1, cpos);
+ var cpos = this.get_caret_pos(this.ksearch_input),
+ p = inp_value.lastIndexOf(',', cpos-1),
+ q = inp_value.substring(p+1, cpos),
+ min = this.env.autocomplete_min_length;
// trim query string
- q = q.replace(/(^\s+|\s+$)/g, '');
+ q = $.trim(q);
// Don't (re-)search if the last results are still active
if (q == this.ksearch_value)
return;
+
+ if (q.length < min) {
+ if (!this.env.acinfo) {
+ var label = this.get_label('autocompletechars');
+ label = label.replace('$min', min);
+ this.env.acinfo = this.display_message(label);
+ }
+ return;
+ }
+ else if (this.env.acinfo && q.length == min) {
+ this.hide_message(this.env.acinfo);
+ }
var old_value = this.ksearch_value;
this.ksearch_value = q;
@@ -3416,8 +3508,8 @@
if (old_value && old_value.length && this.env.contacts && !this.env.contacts.length && q.indexOf(old_value) == 0)
return;
- this.display_message(this.get_label('searching'), 'loading', false);
- this.http_post('autocomplete', '_search='+urlencode(q));
+ var lock = this.display_message(this.get_label('searching'), 'loading');
+ this.http_post('autocomplete', '_search='+urlencode(q), lock);
};
this.ksearch_query_results = function(results, search)
@@ -3426,7 +3518,6 @@
if (this.ksearch_value && search != this.ksearch_value)
return;
- this.hide_message();
this.env.contacts = results ? results : [];
this.ksearch_display_results(this.env.contacts);
};
@@ -3452,7 +3543,7 @@
for (i=0; i < a_results.length; i++) {
text = typeof a_results[i] == 'object' ? a_results[i].name : a_results[i];
li = document.createElement('LI');
- li.innerHTML = text.replace(new RegExp('('+s_val+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
+ li.innerHTML = text.replace(new RegExp('('+RegExp.escape(s_val)+')', '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 = i;
@@ -3531,8 +3622,8 @@
this.list_contacts = function(src, group, page)
{
- var add_url = '';
- var target = window;
+ var add_url = '',
+ target = window;
if (!src)
src = this.env.source;
@@ -3541,8 +3632,7 @@
return false;
if (src != this.env.source) {
- page = 1;
- this.env.current_page = page;
+ page = this.env.current_page = 1;
this.reset_qsearch();
}
else if (group != this.env.group)
@@ -3586,7 +3676,9 @@
this.enable_command('delete', 'compose', false);
// send request to server
- var url = (src ? '_source='+urlencode(src) : '') + (page ? (src?'&':'') + '_page='+page : '');
+ var url = (src ? '_source='+urlencode(src) : '') + (page ? (src?'&':'') + '_page='+page : ''),
+ lock = this.set_busy(true, 'loading');
+
this.env.source = src;
this.env.group = group;
@@ -3597,8 +3689,7 @@
if (this.env.search_request)
url += '&_search='+this.env.search_request;
- this.set_busy(true, 'loading');
- this.http_request('list', url, true);
+ this.http_request('list', url, lock);
};
// load contact record
@@ -3630,18 +3721,31 @@
if (!cid)
cid = this.contact_list.get_selection().join(',');
- 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.env.group ? '&_gid='+urlencode(this.env.group) : ''));
+ if (to.type == 'group' && to.source == this.env.source) {
+ this.http_post('group-addmembers', '_cid='+urlencode(cid)
+ + '&_source='+urlencode(this.env.source)
+ + '&_gid='+urlencode(to.id));
+ }
+ else if (to.type == 'group' && !this.env.address_sources[to.source].readonly) {
+ this.http_post('copy', '_cid='+urlencode(cid)
+ + '&_source='+urlencode(this.env.source)
+ + '&_to='+urlencode(to.source)
+ + '&_togid='+urlencode(to.id)
+ + (this.env.group ? '&_gid='+urlencode(this.env.group) : ''));
+ }
+ 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.env.group ? '&_gid='+urlencode(this.env.group) : ''));
+ }
};
-
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) || (!this.env.group && !confirm(this.get_label('deletecontactconfirm'))))
+ if (!(selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm')))
return;
var id, a_cids = [], qs = '';
@@ -3665,10 +3769,7 @@
qs += '&_search='+this.env.search_request;
// send request to server
- if (this.env.group)
- this.http_post('group-delmembers', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+qs);
- else
- 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);
return true;
};
@@ -3688,7 +3789,7 @@
this.contact_list.remove_row(cid);
this.contact_list.init_row(row);
this.contact_list.selection[0] = newcid;
- ow.style.display = '';
+ row.style.display = '';
}
return true;
@@ -3727,25 +3828,24 @@
this.enable_command('export', (this.contact_list.rowcount > 0));
};
-
- this.add_contact_group = function()
+ this.group_create = function()
{
if (!this.gui_objects.folderlist || !this.env.address_sources[this.env.source].groups)
return;
if (!this.name_input) {
this.name_input = $('<input>').attr('type', 'text');
- this.name_input.bind('keypress', function(e){ return rcmail.add_input_keypress(e); });
+ 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();
+ this.name_input.select().focus();
};
- this.rename_contact_group = function()
+ this.group_rename = function()
{
if (!this.env.group || !this.gui_objects.folderlist)
return;
@@ -3753,7 +3853,7 @@
if (!this.name_input) {
this.enable_command('list', 'listgroup', false);
this.name_input = $('<input>').attr('type', 'text').val(this.env.contactgroups['G'+this.env.source+this.env.group].name);
- this.name_input.bind('keypress', function(e){ return rcmail.add_input_keypress(e); });
+ this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
this.env.group_renaming = true;
var link, li = this.get_folder_li(this.env.source+this.env.group, 'rcmliG');
@@ -3762,10 +3862,10 @@
}
}
- this.name_input.select();
+ this.name_input.select().focus();
};
- this.delete_contact_group = function()
+ this.group_delete = function()
{
if (this.env.group)
this.http_post('group-delete', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group), true);
@@ -3787,7 +3887,7 @@
};
// handler for keyboard events on the input field
- this.add_input_keypress = function(e)
+ this.add_input_keydown = function(e)
{
var key = rcube_event.get_keycode(e);
@@ -3796,11 +3896,11 @@
var newname = this.name_input.val();
if (newname) {
- this.set_busy(true, 'loading');
+ var lock = this.set_busy(true, 'loading');
if (this.env.group_renaming)
- this.http_post('group-rename', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+'&_name='+urlencode(newname), true);
+ 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), true);
+ this.http_post('group-create', '_source='+urlencode(this.env.source)+'&_name='+urlencode(newname), lock);
}
return false;
}
@@ -3861,7 +3961,7 @@
if (li && (link = li.firstChild) && link.tagName.toLowerCase() == 'a')
link.innerHTML = prop.name;
- this.env.contactfolders[key].name = this.env.contactgroups[key].name = name;
+ this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
this.triggerEvent('group_update', { id:prop.id, source:prop.source, name:prop.name, li:li[0] });
};
@@ -3880,9 +3980,9 @@
this.subscription_list.row_init = function (row) {
var anchors = row.obj.getElementsByTagName('a');
if (anchors[0])
- anchors[0].onclick = function() { p.rename_folder(row.id); return false; };
+ anchors[0].onclick = function() { p.command('rename-folder', row.id); return false; };
if (anchors[1])
- anchors[1].onclick = function() { p.delete_folder(row.id); return false; };
+ anchors[1].onclick = function() { p.command('delete-folder', row.id); return false; };
row.obj.onmouseover = function() { p.focus_subscription(row.id); };
row.obj.onmouseout = function() { p.unfocus_subscription(row.id); };
};
@@ -3921,7 +4021,7 @@
if (action=='edit-identity' && (!id || id==this.env.iid))
return false;
- var add_url = '', target = window;
+ var add_url = '', target = window;
if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
add_url = '&_framed=1';
@@ -3956,7 +4056,8 @@
this.focus_subscription = function(id)
{
var row, folder,
- reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
+ delim = RegExp.escape(this.env.delimiter),
+ reg = RegExp('['+delim+']?[^'+delim+']+$');
if (this.drag_active && this.env.folder && (row = document.getElementById(id)))
if (this.env.subscriptionrows[id] &&
@@ -3969,7 +4070,7 @@
$(row).addClass('droptarget');
}
}
- else if (this.env.folder.match(new RegExp(RegExp.escape(this.env.delimiter)))) {
+ else if (this.env.folder.match(new RegExp(delim))) {
this.set_env('dstfolder', this.env.delimiter);
$(this.subscription_list.frame).addClass('droptarget');
}
@@ -4002,15 +4103,17 @@
this.subscription_move_folder = function(list)
{
- var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
+ var delim = RegExp.escape(this.env.delimiter),
+ reg = RegExp('['+delim+']?[^'+delim+']+$');
+
if (this.env.folder && this.env.dstfolder && (this.env.dstfolder != this.env.folder) &&
(this.env.dstfolder != this.env.folder.replace(reg, ''))) {
- var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g');
+ var reg = new RegExp('[^'+delim+']*['+delim+']', '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.set_busy(true, 'foldermoving');
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname), true);
+ var lock = this.set_busy(true, 'foldermoving');
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname), lock);
}
this.drag_active = false;
this.unfocus_subscription(this.get_folder_row_id(this.env.dstfolder));
@@ -4034,8 +4137,8 @@
if (this.env.folder && name != '')
name = this.env.folder+this.env.delimiter+name;
- this.set_busy(true, 'foldercreating');
- this.http_post('create-folder', '_name='+urlencode(name), true);
+ var lock = this.set_busy(true, 'foldercreating');
+ this.http_post('create-folder', '_name='+urlencode(name), lock);
}
else if (form.elements['_folder_name'])
form.elements['_folder_name'].focus();
@@ -4055,14 +4158,16 @@
}
if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id))) {
- var reg = new RegExp('.*['+RegExp.escape(this.env.delimiter)+']');
+ var delim = RegExp.escape(this.env.delimiter),
+ reg = new RegExp('.*['+delim+']');
+
this.name_input = document.createElement('input');
this.name_input.type = 'text';
this.name_input.value = this.env.subscriptionrows[id][0].replace(reg, '');
- reg = new RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
+ reg = new RegExp('['+delim+']?[^'+delim+']+$');
this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
- this.name_input.onkeypress = function(e){ rcmail.name_input_keypress(e); };
+ this.name_input.onkeydown = function(e){ rcmail.name_input_keydown(e); };
row.cells[0].replaceChild(this.name_input, row.cells[0].firstChild);
this.edit_folder = id;
@@ -4085,7 +4190,7 @@
};
// handler for keyboard events on the input field
- this.name_input_keypress = function(e)
+ this.name_input_keydown = function(e)
{
var key = rcube_event.get_keycode(e);
@@ -4101,8 +4206,8 @@
if (this.name_input.__parent)
newname = this.name_input.__parent + this.env.delimiter + newname;
- this.set_busy(true, 'folderrenaming');
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname), true);
+ var lock = this.set_busy(true, 'folderrenaming');
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname), lock);
}
}
// escape
@@ -4119,8 +4224,8 @@
this.reset_folder_rename();
if (folder && confirm(this.get_label('deletefolderconfirm'))) {
- this.set_busy(true, 'folderdeleting');
- this.http_post('delete-folder', '_mboxes='+urlencode(folder), true);
+ var lock = this.set_busy(true, 'folderdeleting');
+ this.http_post('delete-folder', '_mboxes='+urlencode(folder), lock);
this.set_env('folder', null);
$(this.gui_objects.createfolderhint).html('');
@@ -4157,19 +4262,18 @@
this.goto_url('folders');
return false;
}
- else {
- // clone a table row if there are existing rows
- var row = this.clone_table_row(refrow);
- row.id = id;
- if (before && (before = this.get_folder_row_id(before)))
- tbody.insertBefore(row, document.getElementById(before));
- else
- tbody.appendChild(row);
+ // clone a table row if there are existing rows
+ var row = this.clone_table_row(refrow);
+ row.id = id;
- if (replace)
- tbody.removeChild(replace);
- }
+ if (before && (before = this.get_folder_row_id(before)))
+ tbody.insertBefore(row, document.getElementById(before));
+ else
+ tbody.appendChild(row);
+
+ if (replace)
+ tbody.removeChild(replace);
// add to folder/row-ID map
this.env.subscriptionrows[row.id] = [name, display_name, 0];
@@ -4177,21 +4281,22 @@
// set folder name
row.cells[0].innerHTML = display_name;
- // set messages count to zero
- if (!replace)
+ if (!replace) {
+ // set messages count to zero
row.cells[1].innerHTML = '*';
- if (!replace && row.cells[2] && row.cells[2].firstChild.tagName.toLowerCase()=='input') {
- row.cells[2].firstChild.value = name;
- row.cells[2].firstChild.checked = true;
- }
+ // update subscription/threading checkboxes
+ $('input[name="_subscribed[]"]', row).val(name).attr('checked', true);
+ $('input[name="_threaded[]"]', row).val(name).attr('checked', false);
- // add new folder to rename-folder list and clear input field
- if (!replace && (form = this.gui_objects.editform)) {
- if (form.elements['_folder_oldname'])
- form.elements['_folder_oldname'].options[form.elements['_folder_oldname'].options.length] = new Option(name,name);
- if (form.elements['_folder_name'])
- form.elements['_folder_name'].value = '';
+ var elem;
+ // add new folder to rename-folder list and clear input field
+ if (form = this.gui_objects.editform) {
+ if (elem = form.elements['_folder_oldname'])
+ elem.options[elem.options.length] = new Option(name, name);
+ if (elem = form.elements['_folder_name'])
+ elem.value = '';
+ }
}
this.init_subscription_list();
@@ -4245,17 +4350,17 @@
}
}
- if (form && form.elements['_folder_newname'])
- form.elements['_folder_newname'].value = '';
+ if (form && (elm = form.elements['_folder_newname']))
+ elm.value = '';
};
- this.subscribe_folder = function(folder)
+ this.subscribe = function(folder)
{
if (folder)
this.http_post('subscribe', '_mbox='+urlencode(folder));
};
- this.unsubscribe_folder = function(folder)
+ this.unsubscribe = function(folder)
{
if (folder)
this.http_post('unsubscribe', '_mbox='+urlencode(folder));
@@ -4489,43 +4594,80 @@
document.title = title;
};
- // display a system message
- this.display_message = function(msg, type, hold)
+ // display a system message, list of types in common.css (below #message definition)
+ this.display_message = function(msg, type)
{
- if (!this.loaded) {
- // save message in order to display after page loaded
- this.pending_message = new Array(msg, type);
- return true;
- }
-
// pass command to parent window
if (this.env.framed && parent.rcmail)
- return parent.rcmail.display_message(msg, type, hold);
+ return parent.rcmail.display_message(msg, type);
- if (!this.gui_objects.message)
+ if (!this.gui_objects.message) {
+ // save message in order to display after page loaded
+ if (type != 'loading')
+ this.pending_message = new Array(msg, type);
return false;
+ }
- if (this.message_timer)
- clearTimeout(this.message_timer);
+ type = type ? type : 'notice';
- var cont = msg;
- if (type)
- cont = '<div class="'+type+'">'+cont+'</div>';
+ var date = new Date(),
+ id = type + date.getTime();
- var obj = $(this.gui_objects.message).html(cont).show();
+ if (type == 'loading') {
+ if (!msg)
+ msg = this.get_label('loading');
- if (type!='loading')
- obj.bind('mousedown', function(){ ref.hide_message(); return true; });
+ // The same message of type 'loading' is already displayed
+ if (this.messages[msg]) {
+ this.messages[msg].elements.push(id);
+ return id;
+ }
+ }
- if (!hold)
- this.message_timer = window.setTimeout(function(){ ref.hide_message(true); }, this.message_time);
+ var ref = this,
+ obj = $('<div>').addClass(type).html(msg),
+ cont = $(this.gui_objects.message).show();
+
+ if (type == 'loading') {
+ obj.appendTo(cont);
+ this.messages[msg] = {'obj': obj, 'elements': [id]};
+ window.setTimeout(function() { rcmail.hide_message(id); }, this.env.request_timeout * 1000);
+ return id;
+ }
+ else {
+ obj.appendTo(cont).bind('mousedown', function() { return ref.hide_message(obj); });
+ window.setTimeout(function() { ref.hide_message(obj, true); },
+ this.message_time * (type == 'error' ? 2 : 1));
+ return obj;
+ }
};
- // make a message row disapear
- this.hide_message = function(fade)
+ // make a message to disapear
+ this.hide_message = function(obj, fade)
{
- if (this.gui_objects.message)
- $(this.gui_objects.message).unbind()[(fade?'fadeOut':'hide')]();
+ // pass command to parent window
+ if (this.env.framed && parent.rcmail)
+ return parent.rcmail.hide_message(obj, fade);
+
+ if (typeof(obj) == 'object') {
+ // custom message
+ $(obj)[fade?'fadeOut':'hide']();
+ }
+ else {
+ // 'loading' message
+ var k, n, m = this.messages;
+ for (k in m) {
+ for (n in m[k].elements) {
+ if (m[k] && m[k].elements[n] == obj) {
+ m[k].elements.splice(n, 1);
+ if (!m[k].elements.length) {
+ m[k].obj[fade?'fadeOut':'hide']();
+ delete m[k];
+ }
+ }
+ }
+ }
+ }
};
// mark a mailbox as selected and set environment variable
@@ -4603,6 +4745,7 @@
this.env.subject_col = null;
this.env.flagged_col = null;
+ this.env.status_col = null;
if ((n = $.inArray('subject', this.env.coltypes)) >= 0) {
this.set_env('subject_col', n);
@@ -4611,6 +4754,8 @@
}
if ((n = $.inArray('flag', this.env.coltypes)) >= 0)
this.set_env('flagged_col', n);
+ if ((n = $.inArray('status', this.env.coltypes)) >= 0)
+ this.set_env('status_col', n);
this.message_list.init_header();
};
@@ -4635,7 +4780,7 @@
this.set_quota = function(content)
{
if (content && this.gui_objects.quotadisplay) {
- if (typeof(content) == 'object')
+ if (typeof(content) == 'object' && content.type == 'image')
this.percent_indicator(this.gui_objects.quotadisplay, content);
else
$(this.gui_objects.quotadisplay).html(content);
@@ -4734,14 +4879,8 @@
// display fetched raw headers
this.set_headers = function(content)
{
- if (this.gui_objects.all_headers_row && this.gui_objects.all_headers_box && content) {
+ if (this.gui_objects.all_headers_row && this.gui_objects.all_headers_box && content)
$(this.gui_objects.all_headers_box).html(content).show();
-
- if (this.env.framed && parent.rcmail)
- parent.rcmail.set_busy(false);
- else
- this.set_busy(false);
- }
};
// display all-headers row and fetch raw message headers
@@ -4756,8 +4895,8 @@
// fetch headers only once
if (!this.gui_objects.all_headers_box.innerHTML) {
- this.display_message(this.get_label('loading'), 'loading', true);
- this.http_post('headers', '_uid='+this.env.uid);
+ var lock = this.display_message(this.get_label('loading'), 'loading');
+ this.http_post('headers', '_uid='+this.env.uid, lock);
}
};
@@ -4786,6 +4925,9 @@
quota_width = parseInt(quota / 100 * width),
pos = $(obj).position();
+ // Opera bug?
+ pos.top = Math.max(0, pos.top);
+
this.env.indicator_width = width;
this.env.indicator_height = height;
@@ -4794,6 +4936,9 @@
quota_width = width;
quota = 100;
}
+
+ if (data.title)
+ data.title = this.get_label('quota') + ': ' + data.title;
// main div
var main = $('<div>');
@@ -4825,6 +4970,8 @@
// replace quota image
$(obj).html('').append(bar1).append(bar2).append(main);
+ // update #quotaimg title
+ $('#quotaimg').attr('title', data.title);
};
/********************************************************/
@@ -4834,22 +4981,22 @@
this.html2plain = function(htmlText, id)
{
var rcmail = this,
- url = '?_task=utils&_action=html2text';
+ url = '?_task=utils&_action=html2text',
+ lock = this.set_busy(true, 'converting');
- this.set_busy(true, 'converting');
console.log('HTTP POST: ' + url);
$.ajax({ type: 'POST', url: url, data: htmlText, contentType: 'application/octet-stream',
- error: function(o) { rcmail.http_error(o); },
- success: function(data) { rcmail.set_busy(false); $(document.getElementById(id)).val(data); console.log(data); }
+ error: function(o, status, err) { rcmail.http_error(o, status, err, lock); },
+ success: function(data) { rcmail.set_busy(false, null, lock); $(document.getElementById(id)).val(data); console.log(data); }
});
};
this.plain2html = function(plainText, id)
{
- this.set_busy(true, 'converting');
+ var lock = this.set_busy(true, 'converting');
$(document.getElementById(id)).val('<pre>'+plainText+'</pre>');
- this.set_busy(false);
+ this.set_busy(false, null, lock);
};
@@ -4870,42 +5017,70 @@
this.goto_url = function(action, query, lock)
{
- var querystring = query ? '&'+query : '';
- this.redirect(this.env.comm_path+'&_action='+action+querystring, lock);
+ var url = this.env.comm_path,
+ querystring = query ? '&'+query : '';
+
+ // overwrite task name
+ if (action.match(/([a-z]+)\/([a-z-_]+)/)) {
+ action = RegExp.$2;
+ url = url.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
+ }
+
+ this.redirect(url+'&_action='+action+querystring, lock);
};
// send a http request to the server
- this.http_request = function(action, querystring, lock)
+ this.http_request = function(action, query, lock)
{
+ var url = this.env.comm_path;
+
+ // overwrite task name
+ if (action.match(/([a-z]+)\/([a-z-_]+)/)) {
+ action = RegExp.$2;
+ url = url.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
+ }
+
// trigger plugin hook
- var result = this.triggerEvent('request'+action, querystring);
+ var result = this.triggerEvent('request'+action, query);
+
if (typeof result != 'undefined') {
// abort if one the handlers returned false
if (result === false)
return false;
else
- querystring = result;
+ query = result;
}
- querystring += (querystring ? '&' : '') + '_remote=1';
- var url = this.env.comm_path + '&_action=' + action + '&' + querystring;
-
+ url += '&_remote=1&_action=' + action + (query ? '&' : '') + query;
+
// send request
console.log('HTTP GET: ' + url);
- $.get(url, { _unlock:(lock?1:0) }, function(data){ ref.http_response(data); }, 'json');
+ $.ajax({
+ type: 'GET', url: url, data: { _unlock:(lock?lock:0) }, dataType: 'json',
+ success: function(data){ ref.http_response(data); },
+ error: function(o, status, err) { rcmail.http_error(o, status, err, lock); }
+ });
};
// send a http POST request to the server
this.http_post = function(action, postdata, lock)
{
- var url = this.env.comm_path+'&_action=' + action;
+ var url = this.env.comm_path;
+
+ // overwrite task name
+ if (action.match(/([a-z]+)\/([a-z-_]+)/)) {
+ action = RegExp.$2;
+ url = url.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
+ }
+
+ url += '&_action=' + action;
if (postdata && typeof(postdata) == 'object') {
postdata._remote = 1;
- postdata._unlock = (lock ? 1 : 0);
+ postdata._unlock = (lock ? lock : 0);
}
else
- postdata += (postdata ? '&' : '') + '_remote=1' + (lock ? '&_unlock=1' : '');
+ postdata += (postdata ? '&' : '') + '_remote=1' + (lock ? '&_unlock='+lock : '');
// trigger plugin hook
var result = this.triggerEvent('request'+action, postdata);
@@ -4919,12 +5094,19 @@
// send request
console.log('HTTP POST: ' + url);
- $.post(url, postdata, function(data){ ref.http_response(data); }, 'json');
+ $.ajax({
+ type: 'POST', url: url, data: postdata, dataType: 'json',
+ success: function(data){ ref.http_response(data); },
+ error: function(o, status, err) { rcmail.http_error(o, status, err, lock); }
+ });
};
// handle HTTP response
this.http_response = function(response)
{
+ if (!response)
+ return;
+
if (response.unlock)
this.set_busy(false);
@@ -4968,6 +5150,8 @@
if (this.env.action == 'show') {
// re-enable commands on move/delete error
this.enable_command(this.env.message_commands, true);
+ if (!this.env.list_post)
+ this.enable_command('reply-list', false);
}
else if (this.task == 'addressbook') {
this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
@@ -4984,7 +5168,8 @@
this.enable_command(this.env.message_commands, 'purge', 'expunge',
'select-all', 'select-none', 'sort', 'expand-all', 'expand-unread', 'collapse-all', false);
}
- this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
+ if (this.message_list)
+ this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
}
break;
@@ -5016,16 +5201,19 @@
break;
}
+ if (response.unlock)
+ this.hide_message(response.unlock);
+
this.triggerEvent('responseafter', {response: response});
this.triggerEvent('responseafter'+response.action, {response: response});
};
// handle HTTP request errors
- this.http_error = function(request, status, err)
+ this.http_error = function(request, status, err, lock)
{
var errmsg = request.statusText;
- this.set_busy(false);
+ this.set_busy(false, null, lock);
request.abort();
if (errmsg)
@@ -5038,9 +5226,9 @@
if (this._int)
clearInterval(this._int);
- if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.mailboxlist)
+ 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')
+ else if (this.env.keep_alive && !this.env.framed && this.task != 'login' && this.env.action != 'print')
this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
};
@@ -5057,10 +5245,10 @@
if (this.busy)
return;
- var addurl = '_t=' + (new Date().getTime()) + '&_mbox=' + urlencode(this.env.mailbox);
+ var lock, addurl = '_t=' + (new Date().getTime()) + '&_mbox=' + urlencode(this.env.mailbox);
if (refresh) {
- this.set_busy(true, 'checkingmail');
+ lock = this.set_busy(true, 'checkingmail');
addurl += '&_refresh=1';
// reset check-recent interval
this.start_keepalive();
@@ -5073,7 +5261,7 @@
if (this.env.search_request)
addurl += '&_search=' + this.env.search_request;
- this.http_request('check-recent', addurl, true);
+ this.http_request('check-recent', addurl, lock);
};
@@ -5133,19 +5321,28 @@
}
};
- // set all fields of a form disabled
+ // disable/enable all fields of a form
this.lock_form = function(form, lock)
{
if (!form || !form.elements)
return;
- var type;
- for (var n=0, len=form.elements.length; n<len; n++) {
- type = form.elements[n];
- if (type == 'hidden')
+ var n, len, elm;
+
+ if (lock)
+ this.disabled_form_elements = [];
+
+ for (n=0, len=form.elements.length; n<len; n++) {
+ elm = form.elements[n];
+
+ if (elm.type == 'hidden')
continue;
- form.elements[n].disabled = lock;
+ // remember which elem was disabled before lock
+ if (lock && elm.disabled)
+ this.disabled_form_elements.push(elm);
+ else if (lock || $.inArray(elm, this.disabled_form_elements)<0)
+ elm.disabled = lock;
}
};
@@ -5155,3 +5352,4 @@
rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;
rcube_webmail.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener;
rcube_webmail.prototype.triggerEvent = rcube_event_engine.prototype.triggerEvent;
+
--
Gitblit v1.9.1