From d1d0564a91812e3e58569bfa0ef413d36e130d24 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 06 Jun 2012 15:24:52 -0400
Subject: [PATCH] Fix js error when dropping attachment file
---
program/js/app.js | 1348 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 858 insertions(+), 490 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 5e51cbb..7eb8c78 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3,9 +3,12 @@
| Roundcube Webmail Client Script |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2011, The Roundcube Dev Team |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team |
| Copyright (C) 2011, Kolab Systems AG |
- | Licensed under the GNU GPL |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
| Authors: Thomas Bruederli <roundcube@gmail.com> |
@@ -14,8 +17,6 @@
+-----------------------------------------------------------------------+
| Requires: jquery.js, common.js, list.js |
+-----------------------------------------------------------------------+
-
- $Id$
*/
function rcube_webmail()
@@ -30,6 +31,7 @@
this.command_handlers = {};
this.onloads = [];
this.messages = {};
+ this.group2expand = {};
// create protected reference to myself
this.ref = 'rcmail';
@@ -50,9 +52,10 @@
// set jQuery ajax options
$.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); }
+ cache: false,
+ timeout: this.env.request_timeout * 1000,
+ error: function(request, status, err){ ref.http_error(request, status, err); },
+ beforeSend: function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
});
// set environment variable(s)
@@ -132,7 +135,7 @@
this.task = this.env.task;
// check browser
- if (!bw.dom || !bw.xmlhttp_test()) {
+ if (!bw.dom || !bw.xmlhttp_test() || (bw.mz && bw.vendver < 1.9)) {
this.goto_url('error', '_code=0x199');
return;
}
@@ -171,7 +174,7 @@
}
// enable general commands
- this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', true);
+ this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', 'switch-task', true);
if (this.env.permaurl)
this.enable_command('permaurl', true);
@@ -216,20 +219,18 @@
$(this.gui_objects.qsearchbox).focusin(function() { rcmail.message_list.blur(); });
}
- if (!this.env.flag_for_deletion && this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox)
- this.set_alttext('delete', 'movemessagetotrash');
+ this.set_button_titles();
this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward',
'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download',
- 'print', 'load-attachment', 'load-headers', 'forward-attachment'];
+ 'print', 'load-attachment', 'show-headers', 'hide-headers', 'forward-attachment'];
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);
if (this.env.action == 'show') {
- this.http_request('pagenav', '_uid='+this.env.uid+'&_mbox='+urlencode(this.env.mailbox)
- + (this.env.search_request ? '&_search='+this.env.search_request : ''),
+ this.http_request('pagenav', {_uid: this.env.uid, _mbox: this.env.mailbox, _search: this.env.search_request},
this.display_message('', 'loading'));
}
@@ -246,19 +247,20 @@
}
}
else if (this.env.action == 'compose') {
- this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor'];
+ this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor', 'list-adresses'];
if (this.env.drafts_mailbox)
this.env.compose_commands.push('savedraft')
this.enable_command(this.env.compose_commands, 'identities', true);
+ // add more commands (not enabled)
+ $.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']);
+
if (this.env.spellcheck) {
- this.env.spellcheck.spelling_state_observer = function(s){ ref.set_spellcheck_state(s); };
+ this.env.spellcheck.spelling_state_observer = function(s) { ref.spellcheck_state(); };
this.env.compose_commands.push('spellcheck')
- this.set_spellcheck_state('ready');
- if ($("input[name='_is_html']").val() == '1')
- this.display_spellcheck_controls(false);
+ this.enable_command('spellcheck', true);
}
document.onmouseup = function(e){ return p.doc_mouse_up(e); };
@@ -269,7 +271,7 @@
// show printing dialog
else if (this.env.action == 'print' && this.env.uid)
if (bw.safari)
- window.setTimeout('window.print()', 10);
+ setTimeout('window.print()', 10);
else
window.print();
@@ -277,17 +279,37 @@
if (this.gui_objects.mailboxlist) {
this.env.unread_counts = {};
this.gui_objects.folderlist = this.gui_objects.mailboxlist;
- this.http_request('getunread', '');
+ this.http_request('getunread');
+ }
+
+ // init address book widget
+ if (this.gui_objects.contactslist) {
+ this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
+ { multiselect:true, draggable:false, keyboard:false });
+ this.contact_list.addEventListener('select', function(o){ ref.compose_recipient_select(o); });
+ this.contact_list.addEventListener('dblclick', function(o){ ref.compose_add_recipient('to'); });
+ this.contact_list.init();
+ }
+
+ if (this.gui_objects.addressbookslist) {
+ this.gui_objects.folderlist = this.gui_objects.addressbookslist;
+ this.enable_command('list-adresses', true);
}
// ask user to send MDN
if (this.env.mdn_request && this.env.uid) {
- var mdnurl = '_uid='+this.env.uid+'&_mbox='+urlencode(this.env.mailbox);
- if (confirm(this.get_label('mdnrequest')))
- this.http_post('sendmdn', mdnurl);
- else
- this.http_post('mark', mdnurl+'&_flag=mdnsent');
+ var postact = 'sendmdn',
+ postdata = {_uid: this.env.uid, _mbox: this.env.mailbox};
+ if (!confirm(this.get_label('mdnrequest'))) {
+ postdata._flag = 'mdnsent';
+ postact = 'mark';
+ }
+ this.http_post(postact, postdata);
}
+
+ // detect browser capabilities
+ if (!this.is_framed())
+ this.browser_capabilities_check();
break;
@@ -354,8 +376,11 @@
this.enable_command('add', this.env.identities_level < 2);
}
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', 'toggle-editor', true);
+ this.enable_command('save', 'edit', 'toggle-editor', true);
+ this.enable_command('delete', this.env.identities_level < 2);
+
+ if (this.env.action == 'add-identity')
+ $("input[type='text']").first().select();
}
else if (this.env.action == 'folders') {
this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', true);
@@ -407,6 +432,7 @@
// display 'loading' message on form submit, lock submit button
$('form').submit(function () {
$('input[type=submit]', this).prop('disabled', true);
+ rcmail.clear_messages();
rcmail.display_message('', 'loading');
});
@@ -431,6 +457,14 @@
// map implicit containers
if (this.gui_objects.folderlist)
this.gui_containers.foldertray = $(this.gui_objects.folderlist);
+
+ // activate html5 file drop feature (if browser supports it and if configured)
+ if (this.gui_objects.filedrop && this.env.filedrop && ((XMLHttpRequest && XMLHttpRequest.prototype.sendAsBinary) || window.FormData)) {
+ $(document.body).bind('dragover dragleave drop', function(e){ return ref.document_drag_hover(e, e.type == 'dragover'); });
+ $(this.gui_objects.filedrop).addClass('droptarget')
+ .bind('dragover dragleave', function(e){ return ref.file_drag_hover(e, e.type == 'dragover'); })
+ .get(0).addEventListener('drop', function(e){ return ref.file_dropped(e); }, false);
+ }
// trigger init event hook
this.triggerEvent('init', { task:this.task, action:this.env.action });
@@ -547,20 +581,14 @@
break;
case 'list':
- this.reset_qsearch();
+ if (props && props != '')
+ 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');
+ this.set_button_titles();
}
- else if (this.task == 'addressbook') {
+ else if (this.task == 'addressbook')
this.list_contacts(props);
- }
- break;
-
- case 'load-headers':
- this.load_headers(obj);
break;
case 'sort':
@@ -611,7 +639,7 @@
uid = this.get_single_uid();
if (uid && (!this.env.uid || uid != this.env.uid)) {
if (this.env.mailbox == this.env.drafts_mailbox)
- this.goto_url('compose', '_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true);
+ this.goto_url('compose', { _draft_uid: uid, _mbox: this.env.mailbox }, true);
else
this.show_message(uid);
}
@@ -633,13 +661,14 @@
break;
case 'edit':
- if (this.task=='addressbook' && (cid = this.get_single_cid()))
+ if (this.task == 'addressbook' && (cid = this.get_single_cid()))
this.load_contact(cid, 'edit');
- else if (this.task=='settings' && props)
+ else if (this.task == 'settings' && props)
this.load_identity(props, 'edit-identity');
- else if (this.task=='mail' && (cid = this.get_single_uid())) {
- url = (this.env.mailbox == this.env.drafts_mailbox) ? '_draft_uid=' : '_uid=';
- this.goto_url('compose', url+cid+'&_mbox='+urlencode(this.env.mailbox), true);
+ else if (this.task == 'mail' && (cid = this.get_single_uid())) {
+ url = { _mbox: this.env.mailbox };
+ url[this.env.mailbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid'] = cid;
+ this.goto_url('compose', url, true);
}
break;
@@ -749,8 +778,8 @@
case 'always-load':
if (this.env.uid && this.env.sender) {
- this.add_contact(urlencode(this.env.sender));
- window.setTimeout(function(){ ref.command('load-images'); }, 300);
+ this.add_contact(this.env.sender);
+ setTimeout(function(){ ref.command('load-images'); }, 300);
break;
}
@@ -768,7 +797,7 @@
qstring += '&_safe=1';
this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
if (this.attachment_win) {
- window.setTimeout(function(){ ref.attachment_win.focus(); }, 10);
+ setTimeout(function(){ ref.attachment_win.focus(); }, 10);
break;
}
}
@@ -838,6 +867,9 @@
url += '&_mbox='+urlencode(this.env.mailbox);
if (props)
url += '&_to='+urlencode(props);
+ // also send search request so we can go back to search result after message is sent
+ if (this.env.search_request)
+ url += '&_search='+this.env.search_request;
}
// modify url if we're in addressbook
else if (this.task == 'addressbook') {
@@ -873,29 +905,40 @@
break;
case 'spellcheck':
- if (window.tinyMCE && tinyMCE.get(this.env.composebody)) {
- tinyMCE.execCommand('mceSpellCheck', true);
+ if (this.spellcheck_state()) {
+ this.stop_spellchecking();
}
- else if (this.env.spellcheck && this.env.spellcheck.spellCheck && this.spellcheck_ready) {
- this.env.spellcheck.spellCheck();
- this.set_spellcheck_state('checking');
+ else {
+ if (window.tinyMCE && tinyMCE.get(this.env.composebody)) {
+ tinyMCE.execCommand('mceSpellCheck', true);
+ }
+ else if (this.env.spellcheck && this.env.spellcheck.spellCheck) {
+ this.env.spellcheck.spellCheck();
+ }
}
+ this.spellcheck_state();
break;
case 'savedraft':
+ var form = this.gui_objects.messageform, msgid;
+
// Reset the auto-save timer
- self.clearTimeout(this.save_timer);
+ clearTimeout(this.save_timer);
- if (!this.gui_objects.messageform)
+ // saving Drafts is disabled
+ if (!form)
break;
- // if saving Drafts is disabled in main.inc.php
- // or if compose form did not change
- if (!this.env.drafts_mailbox || this.cmp_hash == this.compose_field_hash())
+ // compose form did not change
+ if (this.cmp_hash == this.compose_field_hash()) {
+ this.auto_save_start();
break;
+ }
- var form = this.gui_objects.messageform,
- msgid = this.set_busy(true, 'savingmessage');
+ // re-set keep-alive timeout
+ this.start_keepalive();
+
+ msgid = this.set_busy(true, 'savingmessage');
form.target = "savetarget";
form._draft.value = '1';
@@ -911,7 +954,7 @@
break;
// Reset the auto-save timer
- self.clearTimeout(this.save_timer);
+ clearTimeout(this.save_timer);
// all checks passed, send message
var lang = this.spellcheck_lang(),
@@ -924,14 +967,12 @@
form.action = this.add_url(form.action, '_lang', lang);
form.submit();
- // clear timeout (sending could take longer)
- clearTimeout(this.request_timer);
break;
case 'send-attachment':
// Reset the auto-save timer
- self.clearTimeout(this.save_timer);
-
+ clearTimeout(this.save_timer);
+
this.upload_file(props || this.gui_objects.uploadform);
break;
@@ -939,16 +980,25 @@
this.change_identity($("[name='_from']")[0], true);
break;
+ case 'list-adresses':
+ this.list_contacts(props);
+ this.enable_command('add-recipient', false);
+ break;
+
+ case 'add-recipient':
+ this.compose_add_recipient(props);
+ break;
+
case 'reply-all':
case 'reply-list':
case 'reply':
if (uid = this.get_single_uid()) {
- url = '_reply_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
+ url = {_reply_uid: uid, _mbox: 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');
+ url._all = (!props && this.commands['reply-list'] ? 'list' : 'all');
else if (command == 'reply-list')
- url += '&_all=list';
+ url._all = list;
this.goto_url('compose', url, true);
}
@@ -957,9 +1007,9 @@
case 'forward-attachment':
case 'forward':
if (uid = this.get_single_uid()) {
- url = '_forward_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
+ url = { _forward_uid: uid, _mbox: this.env.mailbox };
if (command == 'forward-attachment' || (!props && this.env.forward_attachment))
- url += '&_attachment=1';
+ url._attachment = 1;
this.goto_url('compose', url, true);
}
break;
@@ -968,7 +1018,7 @@
if (uid = this.get_single_uid()) {
ref.printwin = window.open(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''));
if (this.printwin) {
- window.setTimeout(function(){ ref.printwin.focus(); }, 20);
+ setTimeout(function(){ ref.printwin.focus(); }, 20);
if (this.env.action != 'show')
this.mark_message('read', uid);
}
@@ -979,13 +1029,13 @@
if (uid = this.get_single_uid()) {
ref.sourcewin = window.open(this.env.comm_path+'&_action=viewsource&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox));
if (this.sourcewin)
- window.setTimeout(function(){ ref.sourcewin.focus(); }, 20);
+ setTimeout(function(){ ref.sourcewin.focus(); }, 20);
}
break;
case 'download':
if (uid = this.get_single_uid())
- this.goto_url('viewsource', '&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+'&_save=1');
+ this.goto_url('viewsource', { _uid: uid, _mbox: this.env.mailbox, _save: 1 });
break;
// quicksearch
@@ -1038,7 +1088,7 @@
case 'export':
if (this.contact_list.rowcount > 0) {
- this.goto_url('export', { _source:this.env.source, _gid:this.env.group, _search:this.env.search_request });
+ this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _search: this.env.search_request });
}
break;
@@ -1065,7 +1115,7 @@
default:
var func = command.replace(/-/g, '_');
if (this[func] && typeof this[func] === 'function') {
- ret = this[func](props);
+ ret = this[func](props, obj);
}
break;
}
@@ -1118,14 +1168,6 @@
if (this.gui_objects.editform)
this.lock_form(this.gui_objects.editform, a);
- // clear pending timer
- if (this.request_timer)
- clearTimeout(this.request_timer);
-
- // 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;
};
@@ -1164,19 +1206,12 @@
return url.replace(/_task=[a-z]+/, '_task='+task);
};
- // called when a request timed out
- this.request_timed_out = function()
- {
- this.set_busy(false);
- this.display_message('Request timed out!', 'error');
- };
-
this.reload = function(delay)
{
if (this.is_framed())
parent.rcmail.reload(delay);
else if (delay)
- window.setTimeout(function(){ rcmail.reload(); }, delay);
+ setTimeout(function(){ rcmail.reload(); }, delay);
else if (window.location)
location.href = this.env.comm_path + (this.env.action ? '&_action='+this.env.action : '');
};
@@ -1198,8 +1233,8 @@
return url.replace(/(\?.*)$/, urldata);
}
- else
- return url + '?' + name + '=' + value;
+
+ return url + '?' + name + '=' + value;
};
this.is_framed = function()
@@ -1309,7 +1344,7 @@
this.env.last_folder_target = null;
if (this.folder_auto_timer) {
- window.clearTimeout(this.folder_auto_timer);
+ clearTimeout(this.folder_auto_timer);
this.folder_auto_timer = null;
this.folder_auto_expand = null;
}
@@ -1362,15 +1397,15 @@
// if the folder is collapsed, expand it after 1sec and restart the drag & drop process.
if (div.hasClass('collapsed')) {
if (this.folder_auto_timer)
- window.clearTimeout(this.folder_auto_timer);
+ clearTimeout(this.folder_auto_timer);
this.folder_auto_expand = this.env.mailboxes[k].id;
- this.folder_auto_timer = window.setTimeout(function() {
+ this.folder_auto_timer = setTimeout(function() {
rcmail.command('collapse-folder', rcmail.folder_auto_expand);
rcmail.drag_start(null);
}, 1000);
} else if (this.folder_auto_timer) {
- window.clearTimeout(this.folder_auto_timer);
+ clearTimeout(this.folder_auto_timer);
this.folder_auto_timer = null;
this.folder_auto_expand = null;
}
@@ -1411,8 +1446,9 @@
div.removeClass('expanded').addClass('collapsed');
this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(name)+'&';
- // select parent folder if one of its childs is currently selected
- if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0)
+ // select the folder if one of its childs is currently selected
+ // don't select if it's virtual (#1488346)
+ if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0 && !$(li).hasClass('virtual'))
this.command('list', name);
}
else
@@ -1521,7 +1557,7 @@
// start timer for message preview (wait for double click)
if (selected && this.env.contentframe && !list.multi_selecting && !this.dummy_select)
- this.preview_timer = window.setTimeout(function(){ ref.msglist_get_preview(); }, 200);
+ this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, 200);
else if (this.env.contentframe)
this.show_contentframe(false);
};
@@ -1538,7 +1574,7 @@
clearTimeout(this.preview_timer);
if (this.preview_read_timer)
clearTimeout(this.preview_read_timer);
- this.preview_timer = window.setTimeout(function(){ ref.msglist_get_preview(); }, 200);
+ this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, 200);
}
}
};
@@ -1553,7 +1589,7 @@
var uid = list.get_single_selection();
if (uid && this.env.mailbox == this.env.drafts_mailbox)
- this.goto_url('compose', '_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true);
+ this.goto_url('compose', { _draft_uid: uid, _mbox: this.env.mailbox }, true);
else if (uid)
this.show_message(uid, false, false);
};
@@ -1586,6 +1622,7 @@
{
if (this.env.messages[row.uid])
this.env.messages[row.uid].expanded = row.expanded;
+ $(row.obj)[row.expanded?'addClass':'removeClass']('expanded');
};
this.msglist_set_coltypes = function(list)
@@ -1704,11 +1741,12 @@
flags: flags.extra_flags
});
- var c, n, col, html, tree = '', expando = '',
+ var c, n, col, html, css_class,
+ tree = '', expando = '',
list = this.message_list,
rows = list.rows,
message = this.env.messages[uid],
- css_class = 'message'
+ row_class = 'message'
+ (!flags.seen ? ' unread' : '')
+ (flags.deleted ? ' deleted' : '')
+ (flags.flagged ? ' flagged' : '')
@@ -1718,7 +1756,6 @@
row = document.createElement('tr');
row.id = 'rcmrow'+uid;
- row.className = css_class;
// message status icons
css_class = 'msgicon';
@@ -1755,6 +1792,8 @@
}
else
message.expanded = true;
+
+ row_class += ' thread expanded';
}
else if (message.has_children) {
if (message.expanded === undefined && (this.env.autoexpand_threads == 1 || (this.env.autoexpand_threads == 2 && message.unread_children))) {
@@ -1762,10 +1801,12 @@
}
expando = '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '"> </div>';
+ row_class += ' thread' + (message.expanded? ' expanded' : '');
}
}
tree += '<span id="msgicn'+uid+'" class="'+css_class+'"> </span>';
+ row.className = row_class;
// build subject link
if (!bw.ie && cols.subject) {
@@ -1807,8 +1848,11 @@
else if (c == 'threads')
html = expando;
else if (c == 'subject') {
- if (bw.ie)
+ if (bw.ie) {
col.onmouseover = function() { rcube_webmail.long_subject_title_ie(this, message.depth+1); };
+ if (bw.ie8)
+ tree = '<span></span>' + tree; // #1487821
+ }
html = tree + cols[c];
}
else if (c == 'priority') {
@@ -1848,7 +1892,7 @@
this.set_list_options = function(cols, sort_col, sort_order, threads)
{
- var update, add_url = '';
+ var update, post_data = {};
if (sort_col === undefined)
sort_col = this.env.sort_col;
@@ -1862,7 +1906,7 @@
if (this.env.threading != threads) {
update = 1;
- add_url += '&_threads=' + threads;
+ post_data._threads = threads;
}
if (cols && cols.length) {
@@ -1882,12 +1926,12 @@
if (newcols.join() != oldcols.join()) {
update = 1;
- add_url += '&_cols=' + newcols.join(',');
+ post_data._cols = newcols.join(',');
}
}
if (update)
- this.list_mailbox('', '', sort_col+'_'+sort_order, add_url);
+ this.list_mailbox('', '', sort_col+'_'+sort_order, post_data);
};
// when user doble-clicks on a row
@@ -1912,14 +1956,17 @@
if (this.env.search_request)
url += '&_search='+this.env.search_request;
- if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
+ // add browser capabilities, so we can properly handle attachments
+ url += '&_caps='+urlencode(this.browser_capabilities());
+
+ if (preview && String(target.location.href).indexOf(url) >= 0)
this.show_contentframe(true);
else {
this.location_href(this.env.comm_path+url, target, true);
// mark as read and change mbox unread counter
- if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read >= 0) {
- this.preview_read_timer = window.setTimeout(function() {
+ if (preview && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read >= 0) {
+ this.preview_read_timer = setTimeout(function() {
ref.set_message(id, 'unread', false);
ref.update_thread_root(id, 'read');
if (ref.env.unread_counts[ref.env.mailbox]) {
@@ -1927,7 +1974,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&_quiet=1');
+ ref.http_post('mark', {_uid: id, _flag: 'read', _quiet: 1});
}, this.env.preview_pane_mark_read * 1000);
}
}
@@ -1970,10 +2017,10 @@
if (page > 0 && page <= this.env.pagecount) {
this.env.current_page = page;
- if (this.task == 'mail')
- this.list_mailbox(this.env.mailbox, page);
- else if (this.task == 'addressbook')
+ if (this.task == 'addressbook' || this.contact_list)
this.list_contacts(this.env.source, this.env.group, page);
+ else if (this.task == 'mail')
+ this.list_mailbox(this.env.mailbox, page);
}
};
@@ -1990,23 +2037,23 @@
};
// list messages of a specific mailbox
- this.list_mailbox = function(mbox, page, sort, add_url)
+ this.list_mailbox = function(mbox, page, sort, url)
{
- var url = '', target = window;
+ var target = window;
+
+ if (typeof url != 'object')
+ url = {};
if (!mbox)
mbox = this.env.mailbox ? this.env.mailbox : 'INBOX';
- if (add_url)
- url += add_url;
-
// add sort to url if set
if (sort)
- url += '&_sort=' + sort;
+ url._sort = sort;
// also send search request to get the right messages
if (this.env.search_request)
- url += '&_search='+this.env.search_request;
+ url._search = this.env.search_request;
// set page=1 if changeing to another mailbox
if (this.env.mailbox != mbox) {
@@ -2019,7 +2066,7 @@
this.clear_message_list();
if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
- url += '&_refresh=1';
+ url._refresh = 1;
this.select_folder(mbox, '', true);
this.unmark_folder(mbox, 'recent', '', true);
@@ -2033,13 +2080,16 @@
if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
target = window.frames[this.env.contentframe];
- url += '&_framed=1';
+ url._framed = 1;
}
// load message list to target frame/window
if (mbox) {
this.set_busy(true, 'loading');
- this.location_href(this.env.comm_path+'&_mbox='+urlencode(mbox)+(page ? '&_page='+page : '')+url, target);
+ url._mbox = mbox;
+ if (page)
+ url._page = page;
+ this.location_href(url, target);
}
};
@@ -2054,15 +2104,20 @@
};
// send remote request to load message list
- this.list_mailbox_remote = function(mbox, page, add_url)
+ this.list_mailbox_remote = function(mbox, page, post_data)
{
// clear message list first
this.message_list.clear();
- // send request to server
- var url = '_mbox='+urlencode(mbox)+(page ? '&_page='+page : ''),
- lock = this.set_busy(true, 'loading');
- this.http_request('list', url+add_url, lock);
+ var lock = this.set_busy(true, 'loading');
+
+ if (typeof post_data != 'object')
+ post_data = {};
+ post_data._mbox = mbox;
+ if (page)
+ post_data._page = page;
+
+ this.http_request('list', post_data, lock);
};
// removes messages that doesn't exists from list selection array
@@ -2087,8 +2142,8 @@
while (new_row) {
if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) {
- this.message_list.expand_all(r);
- this.set_unread_children(r.uid);
+ this.message_list.expand_all(r);
+ this.set_unread_children(r.uid);
}
new_row = new_row.nextSibling;
}
@@ -2273,38 +2328,38 @@
row = row.obj.nextSibling;
while (row) {
if (row.nodeType == 1 && (r = rows[row.uid])) {
- if (!r.depth || r.depth <= depth)
- break;
+ if (!r.depth || r.depth <= depth)
+ break;
- r.depth--; // move left
+ r.depth--; // move left
// reset width and clear the content of a tab, icons will be added later
- $('#rcmtab'+r.uid).width(r.depth * 15).html('');
+ $('#rcmtab'+r.uid).width(r.depth * 15).html('');
if (!r.depth) { // a new root
- count++; // increase roots count
- r.parent_uid = 0;
- if (r.has_children) {
- // replace 'leaf' with 'collapsed'
- $('#rcmrow'+r.uid+' '+'.leaf:first')
+ count++; // increase roots count
+ r.parent_uid = 0;
+ if (r.has_children) {
+ // replace 'leaf' with 'collapsed'
+ $('#rcmrow'+r.uid+' '+'.leaf:first')
.attr('id', 'rcmexpando' + r.uid)
- .attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed'))
- .bind('mousedown', {uid:r.uid, p:this},
- function(e) { return e.data.p.expand_message_row(e, e.data.uid); });
+ .attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed'))
+ .bind('mousedown', {uid:r.uid, p:this},
+ function(e) { return e.data.p.expand_message_row(e, e.data.uid); });
- r.unread_children = 0;
- roots.push(r);
- }
- // show if it was hidden
- if (r.obj.style.display == 'none')
- $(r.obj).show();
- }
- else {
- if (r.depth == depth)
- r.parent_uid = parent;
- if (r.unread && roots.length)
- roots[roots.length-1].unread_children++;
- }
- }
- row = row.nextSibling;
+ r.unread_children = 0;
+ roots.push(r);
+ }
+ // show if it was hidden
+ if (r.obj.style.display == 'none')
+ $(r.obj).show();
+ }
+ else {
+ if (r.depth == depth)
+ r.parent_uid = parent;
+ if (r.unread && roots.length)
+ roots[roots.length-1].unread_children++;
+ }
+ }
+ row = row.nextSibling;
}
// update unread_children for roots
@@ -2323,13 +2378,13 @@
while (row) {
if (row.nodeType == 1 && (r = rows[row.uid])) {
- if (!r.depth && cnt)
- cnt--;
+ if (!r.depth && cnt)
+ cnt--;
if (!cnt)
- this.message_list.remove_row(row.uid);
- }
- row = row.nextSibling;
+ this.message_list.remove_row(row.uid);
+ }
+ row = row.nextSibling;
}
};
@@ -2455,23 +2510,23 @@
if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
return;
- var a_uids = [],
+ var a_uids = [], n, selection,
lock = this.display_message(this.get_label('copyingmessage'), 'loading'),
- add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
+ post_data = {_mbox: this.env.mailbox, _target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};
if (this.env.uid)
a_uids[0] = this.env.uid;
else {
- var selection = this.message_list.get_selection();
- for (var n in selection) {
+ selection = this.message_list.get_selection();
+ for (n in selection) {
a_uids.push(selection[n]);
}
}
- add_url += '&_uid='+this.uids_to_list(a_uids);
+ post_data._uid = this.uids_to_list(a_uids);
// send request to server
- this.http_post('copy', '_mbox='+urlencode(this.env.mailbox)+add_url, lock);
+ this.http_post('copy', post_data, lock);
};
// move selected messages to the specified mailbox
@@ -2485,19 +2540,18 @@
return;
var lock = false,
- add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
+ add_post = {_target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};
// show wait message
- if (this.env.action == 'show') {
+ if (this.env.action == 'show')
lock = this.set_busy(true, 'movingmessage');
- }
else
this.show_contentframe(false);
// Hide message command buttons until a message is selected
this.enable_command(this.env.message_commands, false);
- this._with_selected_messages('moveto', lock, add_url);
+ this._with_selected_messages('moveto', lock, add_post);
};
// delete selected messages from the current mailbox
@@ -2527,6 +2581,9 @@
// @TODO: we should check if defined trash mailbox exists
else if (!trash || this.env.mailbox == trash)
this.permanently_remove_messages();
+ // we're in Junk folder and delete_junk is enabled
+ else if (this.env.delete_junk && this.env.junk_mailbox && this.env.mailbox == this.env.junk_mailbox)
+ this.permanently_remove_messages();
// if there is a trash mailbox defined and we're not currently in it
else {
// if shift was pressed delete it immediately
@@ -2549,14 +2606,17 @@
return;
this.show_contentframe(false);
- this._with_selected_messages('delete', false, '&_from='+(this.env.action ? this.env.action : ''));
+ this._with_selected_messages('delete', false, {_from: this.env.action ? this.env.action : ''});
};
// Send a specifc moveto/delete request with UIDs of all selected messages
// @private
- this._with_selected_messages = function(action, lock, add_url)
+ this._with_selected_messages = function(action, lock, post_data)
{
- var a_uids = [], count = 0, msg;
+ var a_uids = [], count = 0, msg, lock;
+
+ if (typeof(post_data) != 'object')
+ post_data = {};
if (this.env.uid)
a_uids[0] = this.env.uid;
@@ -2588,18 +2648,19 @@
// also send search request to get the right messages
if (this.env.search_request)
- add_url += '&_search='+this.env.search_request;
+ post_data._search = this.env.search_request;
if (this.env.display_next && this.env.next_uid)
- add_url += '&_next_uid='+this.env.next_uid;
+ post_data._next_uid = this.env.next_uid;
if (count < 0)
- add_url += '&_count='+(count*-1);
- else if (count > 0)
- // remove threads from the end of the list
+ post_data._count = (count*-1);
+ // remove threads from the end of the list
+ else if (count > 0)
this.delete_excessive_thread_rows();
- add_url += '&_uid='+this.uids_to_list(a_uids);
+ post_data._uid = this.uids_to_list(a_uids);
+ post_data._mbox = this.env.mailbox;
if (!lock) {
msg = action == 'moveto' ? 'movingmessage' : 'deletingmessage';
@@ -2607,7 +2668,7 @@
}
// send request to server
- this.http_post(action, '_mbox='+urlencode(this.env.mailbox)+add_url, lock);
+ this.http_post(action, post_data, lock);
};
// set a specific flag to one or more messages
@@ -2666,7 +2727,7 @@
this.toggle_read_status = function(flag, a_uids)
{
var i, len = a_uids.length,
- url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag,
+ post_data = {_uid: this.uids_to_list(a_uids), _flag: flag},
lock = this.display_message(this.get_label('markingmessage'), 'loading');
// mark all message rows as read/unread
@@ -2675,9 +2736,9 @@
// also send search request to get the right messages
if (this.env.search_request)
- url += '&_search='+this.env.search_request;
+ post_data._search = this.env.search_request;
- this.http_post('mark', url, lock);
+ this.http_post('mark', post_data, lock);
for (i=0; i<len; i++)
this.update_thread_root(a_uids[i], flag);
@@ -2687,7 +2748,7 @@
this.toggle_flagged_status = function(flag, a_uids)
{
var i, len = a_uids.length,
- url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag,
+ post_data = {_uid: this.uids_to_list(a_uids), _flag: flag},
lock = this.display_message(this.get_label('markingmessage'), 'loading');
// mark all message rows as flagged/unflagged
@@ -2696,9 +2757,9 @@
// also send search request to get the right messages
if (this.env.search_request)
- url += '&_search='+this.env.search_request;
+ post_data._search = this.env.search_request;
- this.http_post('mark', url, lock);
+ this.http_post('mark', post_data, lock);
};
// mark all message rows as deleted/undeleted
@@ -2736,7 +2797,7 @@
this.flag_as_undeleted = function(a_uids)
{
var i, len=a_uids.length,
- url = '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete',
+ post_data = {_uid: this.uids_to_list(a_uids), _flag: 'undelete'},
lock = this.display_message(this.get_label('markingmessage'), 'loading');
for (i=0; i<len; i++)
@@ -2744,16 +2805,17 @@
// also send search request to get the right messages
if (this.env.search_request)
- url += '&_search='+this.env.search_request;
+ post_data._search = this.env.search_request;
- this.http_post('mark', url, lock);
+ this.http_post('mark', post_data, lock);
return true;
};
this.flag_as_deleted = function(a_uids)
{
- var add_url = '',
- r_uids = [],
+ var r_uids = [],
+ post_data = {_uid: this.uids_to_list(a_uids), _flag: 'delete'},
+ lock = this.display_message(this.get_label('markingmessage'), 'loading'),
rows = this.message_list ? this.message_list.rows : [],
count = 0;
@@ -2763,12 +2825,12 @@
if (rows[uid].unread)
r_uids[r_uids.length] = uid;
- if (this.env.skip_deleted) {
- count += this.update_thread(uid);
+ if (this.env.skip_deleted) {
+ count += this.update_thread(uid);
this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1));
- }
- else
- this.set_message(uid, 'deleted', true);
+ }
+ else
+ this.set_message(uid, 'deleted', true);
}
}
@@ -2777,29 +2839,27 @@
if(!this.env.display_next)
this.message_list.clear_selection();
if (count < 0)
- add_url += '&_count='+(count*-1);
+ post_data._count = (count*-1);
else if (count > 0)
// remove threads from the end of the list
this.delete_excessive_thread_rows();
}
- add_url = '&_from='+(this.env.action ? this.env.action : ''),
- lock = this.display_message(this.get_label('markingmessage'), 'loading');
+ if (this.env.action)
+ post_data._from = this.env.action;
// ??
if (r_uids.length)
- add_url += '&_ruid='+this.uids_to_list(r_uids);
+ post_data._ruid = this.uids_to_list(r_uids);
- if (this.env.skip_deleted) {
- if (this.env.display_next && this.env.next_uid)
- add_url += '&_next_uid='+this.env.next_uid;
- }
+ if (this.env.skip_deleted && this.env.display_next && this.env.next_uid)
+ post_data._next_uid = this.env.next_uid;
// also send search request to get the right messages
if (this.env.search_request)
- add_url += '&_search='+this.env.search_request;
+ post_data._search = this.env.search_request;
- this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=delete'+add_url, lock);
+ this.http_post('mark', post_data, lock);
return true;
};
@@ -2826,6 +2886,19 @@
return this.select_all_mode ? '*' : uids.join(',');
};
+ // Sets title of the delete button
+ this.set_button_titles = function()
+ {
+ var label = 'deletemessage';
+
+ if (!this.env.flag_for_deletion
+ && this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox
+ && (!this.env.delete_junk || !this.env.junk_mailbox || this.env.mailbox != this.env.junk_mailbox)
+ )
+ label = 'movemessagetotrash';
+
+ this.set_alttext('delete', label);
+ };
/*********************************************************/
/********* mailbox folders methods *********/
@@ -2833,24 +2906,23 @@
this.expunge_mailbox = function(mbox)
{
- var lock, url = '_mbox='+urlencode(mbox);
+ var lock, post_data = {_mbox: mbox};
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
lock = this.set_busy(true, 'loading');
- url += '&_reload=1';
+ post_data._reload = 1;
if (this.env.search_request)
- url += '&_search='+this.env.search_request;
+ post_data._search = this.env.search_request;
}
// send request to server
- this.http_post('expunge', url, lock);
+ this.http_post('expunge', post_data, lock);
};
this.purge_mailbox = function(mbox)
{
- var lock = false,
- url = '_mbox='+urlencode(mbox);
+ var lock, post_data = {_mbox: mbox};
if (!confirm(this.get_label('purgefolderconfirm')))
return false;
@@ -2858,11 +2930,11 @@
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
lock = this.set_busy(true, 'loading');
- url += '&_reload=1';
+ post_data._reload = 1;
}
// send request to server
- this.http_post('purge', url, lock);
+ this.http_post('purge', post_data, lock);
};
// test if purge command is allowed
@@ -2930,7 +3002,7 @@
this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
// add signature according to selected identity
// if we have HTML editor, signature is added in callback
- if (input_from.prop('type') == 'select-one' && $("input[name='_draft_saveid']").val() == '') {
+ if (input_from.prop('type') == 'select-one') {
this.change_identity(input_from[0]);
}
}
@@ -2957,6 +3029,38 @@
obj[bw.ie || bw.safari || bw.chrome ? 'keydown' : 'keypress'](function(e) { return ref.ksearch_keydown(e, this, props); })
.attr('autocomplete', 'off');
+ };
+
+ this.compose_recipient_select = function(list)
+ {
+ this.enable_command('add-recipient', list.selection.length > 0);
+ };
+
+ this.compose_add_recipient = function(field)
+ {
+ var recipients = [], input = $('#_'+field);
+
+ if (this.contact_list && this.contact_list.selection.length) {
+ for (var id, n=0; n < this.contact_list.selection.length; n++) {
+ id = this.contact_list.selection[n];
+ if (id && this.env.contactdata[id]) {
+ recipients.push(this.env.contactdata[id]);
+
+ // group is added, expand it
+ if (id.charAt(0) == 'E' && this.env.contactdata[id].indexOf('@') < 0 && input.length) {
+ var gid = id.substr(1);
+ this.group2expand[gid] = { name:this.env.contactdata[id], input:input.get(0) };
+ this.http_request('group-expand', {_source: this.env.source, _gid: gid}, false);
+ }
+ }
+ }
+ }
+
+ if (recipients.length && input.length) {
+ var oldval = input.val();
+ input.val((oldval ? oldval + this.env.recipients_delimiter : '') + recipients.join(this.env.recipients_delimiter));
+ this.triggerEvent('add-recipient', { field:field, recipients:recipients });
+ }
};
// checks the input fields before sending a message
@@ -3044,20 +3148,19 @@
this.toggle_editor = function(props)
{
+ this.stop_spellchecking();
+
if (props.mode == 'html') {
- this.display_spellcheck_controls(false);
this.plain2html($('#'+props.id).val(), props.id);
tinyMCE.execCommand('mceAddControl', false, props.id);
if (this.env.default_font)
- window.setTimeout(function() {
+ setTimeout(function() {
$(tinyMCE.get(props.id).getBody()).css('font-family', rcmail.env.default_font);
}, 500);
}
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'))) {
@@ -3066,7 +3169,6 @@
this.html2plain(existingHtml, props.id);
}
tinyMCE.execCommand('mceRemoveControl', false, props.id);
- this.display_spellcheck_controls(true);
}
return true;
@@ -3075,43 +3177,53 @@
this.stop_spellchecking = function()
{
var ed;
+
if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody))) {
- if (ed.plugins.spellchecker && ed.plugins.spellchecker.active)
+ if (ed.plugins && 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');
+ else if (ed = this.env.spellcheck) {
+ if (ed.state && ed.state != 'ready' && ed.state != 'no_error_found')
+ $(ed.spell_span).trigger('click');
}
+
+ this.spellcheck_state();
};
- this.display_spellcheck_controls = function(vis)
+ this.spellcheck_state = function()
{
- if (this.env.spellcheck) {
- // stop spellchecking process
- if (!vis)
- this.stop_spellchecking();
+ var ed, active;
- $(this.env.spellcheck.spell_container)[vis ? 'show' : 'hide']();
- }
- };
+ if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins && ed.plugins.spellchecker)
+ active = ed.plugins.spellchecker.active;
+ else if ((ed = this.env.spellcheck) && ed.state)
+ active = ed.state != 'ready' && ed.state != 'no_error_found';
- this.set_spellcheck_state = function(s)
- {
- this.spellcheck_ready = (s == 'ready' || s == 'no_error_found');
- this.enable_command('spellcheck', this.spellcheck_ready);
+ if (rcmail.buttons.spellcheck)
+ $('#'+rcmail.buttons.spellcheck[0].id)[active ? 'addClass' : 'removeClass']('selected');
+
+ return active;
};
// get selected language
this.spellcheck_lang = function()
{
var ed;
- if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins.spellchecker) {
+
+ if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins && ed.plugins.spellchecker)
return ed.plugins.spellchecker.selectedLang;
- }
- else if (this.env.spellcheck) {
+ else if (this.env.spellcheck)
return GOOGIE_CUR_LANG;
- }
+ };
+
+ this.spellcheck_lang_set = function(lang)
+ {
+ var ed;
+
+ if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins)
+ ed.plugins.spellchecker.selectedLang = lang;
+ else if (this.env.spellcheck)
+ this.env.spellcheck.setCurrentLanguage(lang);
};
// resume spellchecking, highlight provided mispellings without new ajax request
@@ -3130,6 +3242,8 @@
sp.prepare(false, true);
sp.processData(data);
}
+
+ this.spellcheck_state();
}
this.set_draft_id = function(id)
@@ -3140,7 +3254,7 @@
this.auto_save_start = function()
{
if (this.env.draft_autosave)
- this.save_timer = self.setTimeout(function(){ ref.command("savedraft"); }, this.env.draft_autosave * 1000);
+ this.save_timer = setTimeout(function(){ ref.command("savedraft"); }, this.env.draft_autosave * 1000);
// Unlock interface now that saving is complete
this.busy = false;
@@ -3149,20 +3263,11 @@
this.compose_field_hash = function(save)
{
// check input fields
- var ed, str = '',
- value_to = $("[name='_to']").val(),
- value_cc = $("[name='_cc']").val(),
- value_bcc = $("[name='_bcc']").val(),
- value_subject = $("[name='_subject']").val();
+ var ed, i, val, str = '', hash_fields = ['to', 'cc', 'bcc', 'subject'];
- if (value_to)
- str += value_to+':';
- if (value_cc)
- str += value_cc+':';
- if (value_bcc)
- str += value_bcc+':';
- if (value_subject)
- str += value_subject+':';
+ for (i=0; i<hash_fields.length; i++)
+ if (val = $('[name="_' + hash_fields[i] + '"]').val())
+ str += val + ':';
if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)))
str += ed.getContent();
@@ -3356,11 +3461,7 @@
var content = '<span>' + this.get_label('uploading' + (files > 1 ? 'many' : '')) + '</span>',
ts = frame_name.replace(/^rcmupload/, '');
- if (this.env.loadingicon)
- content = '<img src="'+this.env.loadingicon+'" alt="" class="uploading" />'+content;
- if (this.env.cancelicon)
- content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload" class="cancelupload"><img src="'+this.env.cancelicon+'" alt="" /></a>'+content;
- this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false });
+ this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', frame:frame_name, complete:false });
// upload progress support
if (this.env.upload_progress_time) {
@@ -3379,6 +3480,13 @@
{
if (!this.gui_objects.attachmentlist)
return false;
+
+ if (!att.complete && ref.env.loadingicon)
+ att.html = '<img src="'+ref.env.loadingicon+'" alt="" class="uploading" />' + att.html;
+
+ if (!att.complete && att.frame)
+ att.html = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+name+'\', \''+att.frame+'\');" href="#cancelupload" class="cancelupload">'
+ + (this.env.cancelicon ? '<img src="'+this.env.cancelicon+'" alt="" />' : this.get_label('cancel')) + '</a>' + att.html;
var indicator, li = $('<li>').attr('id', name).addClass(att.classname).html(att.html);
@@ -3424,7 +3532,7 @@
this.upload_progress_start = function(action, name)
{
- window.setTimeout(function() { rcmail.http_request(action, {_progress: name}); },
+ setTimeout(function() { rcmail.http_request(action, {_progress: name}); },
this.env.upload_progress_time * 1000);
};
@@ -3445,7 +3553,7 @@
this.add_contact = function(value)
{
if (value)
- this.http_post('addcontact', '_address='+value);
+ this.http_post('addcontact', {_address: value});
return true;
};
@@ -3454,18 +3562,23 @@
this.qsearch = function(value)
{
if (value != '') {
- var n, lock = this.set_busy(true, 'searching');
+ var r, lock = this.set_busy(true, 'searching'),
+ url = this.search_params(value);
if (this.message_list)
this.clear_message_list();
else if (this.contact_list)
this.list_contacts_clear();
+ if (this.env.source)
+ url._source = this.env.source;
+ if (this.env.group)
+ url._gid = this.env.group;
+
// 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);
+
+ r = this.http_request('search', url, lock);
this.env.qsearch = {lock: lock, request: r};
}
@@ -3474,7 +3587,7 @@
// build URL params for search
this.search_params = function(search, filter)
{
- var n, url = [], mods_arr = [],
+ var n, url = {}, mods_arr = [],
mods = this.env.search_mods,
mbox = this.env.mailbox;
@@ -3485,10 +3598,10 @@
search = this.gui_objects.qsearchbox.value;
if (filter)
- url.push('_filter=' + urlencode(filter));
+ url._filter = filter;
if (search) {
- url.push('_q='+urlencode(search));
+ url._q = search;
if (mods && this.message_list)
mods = mods[mbox] ? mods[mbox] : mods['*'];
@@ -3496,14 +3609,14 @@
if (mods) {
for (n in mods)
mods_arr.push(n);
- url.push('_headers='+mods_arr.join(','));
+ url._headers = mods_arr.join(',');
}
}
if (mbox)
- url.push('_mbox='+urlencode(mbox));
+ url._mbox = mbox;
- return url.join('&');
+ return url;
};
// reset quick-search form
@@ -3524,7 +3637,7 @@
{
this.display_message(msg, type);
// before redirect we need to wait some time for Chrome (#1486177)
- window.setTimeout(function(){ ref.list_mailbox(); }, 500);
+ setTimeout(function(){ ref.list_mailbox(); }, 500);
};
@@ -3543,9 +3656,9 @@
mod = rcube_event.get_modifier(e);
switch (key) {
- case 38: // key up
- case 40: // key down
- if (!this.ksearch_pane)
+ case 38: // arrow up
+ case 40: // arrow down
+ if (!this.ksearch_visible())
break;
var dir = key==38 ? 1 : 0;
@@ -3582,11 +3695,11 @@
case 37: // left
case 39: // right
if (mod != SHIFT_KEY)
- return;
+ return;
}
// start timer
- this.ksearch_timer = window.setTimeout(function(){ ref.ksearch_get_results(props); }, 200);
+ this.ksearch_timer = setTimeout(function(){ ref.ksearch_get_results(props); }, 200);
this.ksearch_input = obj;
return true;
@@ -3630,9 +3743,8 @@
// insert all members of a group
if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].id) {
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);
+ this.group2expand[this.env.contacts[id].id] = $.extend({ input: this.ksearch_input }, this.env.contacts[id]);
+ this.http_request('mail/group-expand', {_source: this.env.contacts[id].source, _gid: this.env.contacts[id].id}, false);
}
else if (typeof this.env.contacts[id] === 'string') {
insert = this.env.contacts[id] + this.env.recipients_delimiter;
@@ -3652,10 +3764,10 @@
this.replace_group_recipients = function(id, recipients)
{
- if (this.group2expand && this.group2expand.id == id) {
- this.group2expand.input.value = this.group2expand.input.value.replace(this.group2expand.name, recipients);
- this.triggerEvent('autocomplete_insert', { field:this.group2expand.input, insert:recipients });
- this.group2expand = null;
+ if (this.group2expand[id]) {
+ this.group2expand[id].input.value = this.group2expand[id].input.value.replace(this.group2expand[id].name, recipients);
+ this.triggerEvent('autocomplete_insert', { field:this.group2expand[id].input, insert:recipients });
+ this.group2expand[id] = null;
}
};
@@ -3702,10 +3814,11 @@
return;
// ...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)
+ if (old_value && old_value.length && q.indexOf(old_value) == 0 && (!ac || ac.num <= 0) && this.env.contacts && !this.env.contacts.length)
return;
var i, lock, source, xhr, reqid = new Date().getTime(),
+ post_data = {_search: q, _id: reqid},
threads = props && props.threads ? props.threads : 1,
sources = props && props.sources ? props.sources : [],
action = props && props.action ? props.action : 'mail/autocomplete';
@@ -3715,12 +3828,12 @@
for (i=0; i<threads; i++) {
source = this.ksearch_data.sources.shift();
- if (threads > 1 && source === null)
+ if (threads > 1 && source === undefined)
break;
+ post_data._source = source ? source : '';
lock = this.display_message(this.get_label('searching'), 'loading');
- xhr = this.http_post(action, '_search='+urlencode(q)+'&_id='+reqid
- + (source ? '&_source='+urlencode(source) : ''), lock);
+ xhr = this.http_post(action, post_data, lock);
this.ksearch_data.locks.push(lock);
this.ksearch_data.requests.push(xhr);
@@ -3798,11 +3911,11 @@
if (data.id == reqid) {
data.num--;
if (maxlen > 0 && data.sources.length) {
- var lock, xhr, source = data.sources.shift();
+ var lock, xhr, source = data.sources.shift(), post_data;
if (source) {
+ post_data = {_search: value, _id: reqid, _source: 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);
+ xhr = this.http_post(data.action, post_data, lock);
this.ksearch_data.locks.push(lock);
this.ksearch_data.requests.push(xhr);
@@ -3894,7 +4007,7 @@
source = this.env.source ? this.env.address_sources[this.env.source] : null;
if (id = list.get_single_selection())
- this.preview_timer = window.setTimeout(function(){ ref.load_contact(id, 'show'); }, 200);
+ this.preview_timer = setTimeout(function(){ ref.load_contact(id, 'show'); }, 200);
else if (this.env.contentframe)
this.show_contentframe(false);
@@ -3915,6 +4028,10 @@
}
}
+ // if a group is currently selected, and there is at least one contact selected
+ // thend we can enable the group-remove-selected command
+ this.enable_command('group-remove-selected', typeof this.env.group != 'undefined' && 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);
@@ -3924,7 +4041,7 @@
this.list_contacts = function(src, group, page)
{
- var folder, add_url = '',
+ var folder, url = {},
target = window;
if (!src)
@@ -3958,20 +4075,22 @@
if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
target = window.frames[this.env.contentframe];
- add_url = '&_framed=1';
+ url._framed = 1;
}
if (group)
- add_url += '&_gid='+group;
+ url._gid = group;
if (page)
- add_url += '&_page='+page;
+ url._page = page;
+ if (src)
+ url._source = src;
// also send search request to get the correct listing
if (this.env.search_request)
- add_url += '&_search='+this.env.search_request;
+ url._search = this.env.search_request;
this.set_busy(true, 'loading');
- this.location_href(this.env.comm_path + (src ? '&_source='+urlencode(src) : '') + add_url, target);
+ this.location_href(url, target);
};
// send remote request to load contacts list
@@ -3981,20 +4100,23 @@
this.list_contacts_clear();
// send request to server
- var url = (src ? '_source='+urlencode(src) : '') + (page ? (src?'&':'') + '_page='+page : ''),
- lock = this.set_busy(true, 'loading');
+ var url = {}, lock = this.set_busy(true, 'loading');
+
+ if (src)
+ url._source = src;
+ if (page)
+ url._page = page;
+ if (group)
+ url._gid = group;
this.env.source = src;
this.env.group = group;
- if (group)
- url += '&_gid='+group;
-
// also send search request to get the right messages
if (this.env.search_request)
- url += '&_search='+this.env.search_request;
+ url._search = this.env.search_request;
- this.http_request('list', url, lock);
+ this.http_request(this.env.task == 'mail' ? 'list-contacts' : 'list', url, lock);
};
this.list_contacts_clear = function()
@@ -4008,10 +4130,10 @@
// load contact record
this.load_contact = function(cid, action, framed)
{
- var add_url = '', target = window;
+ var url = {}, target = window;
if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
- add_url = '&_framed=1';
+ url._framed = 1;
target = window.frames[this.env.contentframe];
this.show_contentframe(true);
@@ -4027,12 +4149,15 @@
if (action && (cid || action=='add') && !this.drag_active) {
if (this.env.group)
- add_url += '&_gid='+urlencode(this.env.group);
+ url._gid = this.env.group;
- this.location_href(this.env.comm_path+'&_action='+action
- +'&_source='+urlencode(this.env.source)
- +'&_cid='+urlencode(cid) + add_url, target, true);
+ url._action = action;
+ url._source = this.env.source;
+ url._cid = cid;
+
+ this.location_href(url, target, true);
}
+
return true;
};
@@ -4040,11 +4165,11 @@
this.group_member_change = function(what, cid, source, gid)
{
what = what == 'add' ? 'add' : 'del';
- var lock = this.display_message(this.get_label(what == 'add' ? 'addingmember' : 'removingmember'), 'loading');
+ var label = this.get_label(what == 'add' ? 'addingmember' : 'removingmember'),
+ lock = this.display_message(label, 'loading'),
+ post_data = {_cid: cid, _source: source, _gid: gid};
- this.http_post('group-'+what+'members', '_cid='+urlencode(cid)
- + '&_source='+urlencode(source)
- + '&_gid='+urlencode(gid), lock);
+ this.http_post('group-'+what+'members', post_data, lock);
};
// copy a contact to the specified target (group or directory)
@@ -4056,19 +4181,18 @@
if (to.type == 'group' && to.source == this.env.source)
this.group_member_change('add', cid, to.source, to.id);
else if (to.type == 'group' && !this.env.address_sources[to.source].readonly) {
- var lock = this.display_message(this.get_label('copyingcontact'), 'loading');
- 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) : ''), lock);
+ var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
+ post_data = {_cid: cid, _source: this.env.source, _to: to.source, _togid: to.id,
+ _gid: (this.env.group ? this.env.group : '')};
+
+ this.http_post('copy', post_data, lock);
}
else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly) {
- var lock = this.display_message(this.get_label('copyingcontact'), 'loading');
- this.http_post('copy', '_cid='+urlencode(cid)
- + '&_source='+urlencode(this.env.source)
- + '&_to='+urlencode(to.id)
- + (this.env.group ? '&_gid='+urlencode(this.env.group) : ''), lock);
+ var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
+ post_data = {_cid: cid, _source: this.env.source, _to: to.id,
+ _gid: (this.env.group ? this.env.group : '')};
+
+ this.http_post('copy', post_data, lock);
}
};
@@ -4081,7 +4205,9 @@
if (!(selection.length || this.env.cid) || (!undelete && !confirm(this.get_label('deletecontactconfirm'))))
return;
- var id, n, a_cids = [], qs = '';
+ var id, n, a_cids = [],
+ post_data = {_source: this.env.source, _from: (this.env.action ? this.env.action : '')},
+ lock = this.display_message(this.get_label('contactdeleting'), 'loading');
if (this.env.cid)
a_cids.push(this.env.cid);
@@ -4097,18 +4223,17 @@
this.show_contentframe(false);
}
+ post_data._cid = a_cids.join(',');
+
if (this.env.group)
- qs += '&_gid='+urlencode(this.env.group);
+ post_data._gid = this.env.group;
// also send search request to get the right records from the next page
if (this.env.search_request)
- qs += '&_search='+this.env.search_request;
+ post_data._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.display_message(this.get_label('contactdeleting'), 'loading'));
+ this.http_post('delete', post_data, lock)
return true;
};
@@ -4145,7 +4270,7 @@
};
// add row to contacts list
- this.add_contact_row = function(cid, cols, select)
+ this.add_contact_row = function(cid, cols, classes)
{
if (!this.gui_objects.contactslist)
return false;
@@ -4154,7 +4279,7 @@
row = document.createElement('tr');
row.id = 'rcmrow'+this.html_identifier(cid);
- row.className = 'contact';
+ row.className = 'contact ' + (classes || '');
if (list.in_selection(cid))
row.className += ' selected';
@@ -4200,7 +4325,6 @@
yearRange: '-100:+10',
showOtherMonths: true,
selectOtherMonths: true,
- monthNamesShort: this.env.month_names,
onSelect: function(dateText) { $(this).focus().val(dateText) }
});
$('input.datepicker').datepicker();
@@ -4238,7 +4362,7 @@
{
if (this.env.group && confirm(this.get_label('deletegroupconfirm'))) {
var lock = this.set_busy(true, 'groupdeleting');
- this.http_post('group-delete', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group), lock);
+ this.http_post('group-delete', {_source: this.env.source, _gid: this.env.group}, lock);
}
};
@@ -4275,6 +4399,25 @@
this.name_input.select().focus();
};
+ //remove selected contacts from current active group
+ this.group_remove_selected = function()
+ {
+ ref.http_post('group-delmembers', {_cid: this.contact_list.selection,
+ _source: this.env.source, _gid: this.env.group});
+ };
+
+ //callback after deleting contact(s) from current group
+ this.remove_group_contacts = function(props)
+ {
+ if('undefined' != typeof this.env.group && (this.env.group === props.gid)){
+ var n, selection = this.contact_list.get_selection();
+ for (n=0; n<selection.length; n++) {
+ id = selection[n];
+ this.contact_list.remove_row(id, (n == selection.length-1));
+ }
+ }
+ }
+
// handler for keyboard events on the input field
this.add_input_keydown = function(e)
{
@@ -4289,11 +4432,11 @@
var lock = this.set_busy(true, 'loading');
if (itype == 'contactsearch')
- this.http_post('search-create', '_search='+urlencode(this.env.search_request)+'&_name='+urlencode(newname), lock);
+ this.http_post('search-create', {_search: this.env.search_request, _name: 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);
+ this.http_post('group-rename', {_source: this.env.source, _gid: this.env.group, _name: newname}, lock);
else
- this.http_post('group-create', '_source='+urlencode(this.env.source)+'&_name='+urlencode(newname), lock);
+ this.http_post('group-create', {_source: this.env.source, _name: newname}, lock);
}
return false;
}
@@ -4419,12 +4562,13 @@
this.init_edit_field = function(col, elem)
{
+ var label = this.env.coltypes[col].label;
+
if (!elem)
elem = $('.ff_' + col);
- elem.focus(function(){ ref.focus_textfield(this); })
- .blur(function(){ ref.blur_textfield(this); })
- .each(function(){ this._placeholder = this.title = (ref.env.coltypes[col].label || ''); ref.blur_textfield(this); });
+ if (label)
+ elem.placeholder(label);
};
this.insert_edit_field = function(col, section, menu)
@@ -4439,8 +4583,15 @@
var lastelem = $('.ff_'+col),
appendcontainer = $('#contactsection'+section+' .contactcontroller'+col);
- if (!appendcontainer.length)
- appendcontainer = $('<fieldset>').addClass('contactfieldgroup contactcontroller'+col).insertAfter($('#contactsection'+section+' .contactfieldgroup').last());
+ if (!appendcontainer.length) {
+ var sect = $('#contactsection'+section),
+ lastgroup = $('.contactfieldgroup', sect).last();
+ appendcontainer = $('<fieldset>').addClass('contactfieldgroup contactcontroller'+col);
+ if (lastgroup.length)
+ appendcontainer.insertAfter(lastgroup);
+ else
+ sect.prepend(appendcontainer);
+ }
if (appendcontainer.length && appendcontainer.get(0).nodeName == 'FIELDSET') {
var input, colprop = this.env.coltypes[col],
@@ -4464,6 +4615,14 @@
if (colprop.type == 'date' && $.datepicker)
input.datepicker();
+ }
+ else if (colprop.type == 'textarea') {
+ input = $('<textarea>')
+ .addClass('ff_'+col)
+ .attr({ name: '_'+col+name_suffix, cols:colprop.size, rows:colprop.rows })
+ .appendTo(cell);
+
+ this.init_edit_field(col, input);
}
else if (colprop.type == 'composite') {
var childcol, cp, first, templ, cols = [], suffices = [];
@@ -4583,7 +4742,7 @@
{
var n, buttons = this.buttons['upload-photo'];
for (n=0; buttons && n < buttons.length; n++)
- $('#'+buttons[n].id).html(this.get_label(id == '-del-' ? 'addphoto' : 'replacephoto'));
+ $('a#'+buttons[n].id).html(this.get_label(id == '-del-' ? 'addphoto' : 'replacephoto'));
$('#ff_photo').val(id);
this.enable_command('upload-photo', this.env.coltypes.photo ? true : false);
@@ -4593,15 +4752,15 @@
// load advanced search page
this.advanced_search = function()
{
- var add_url = '&_form=1', target = window;
+ var url = {_form: 1, _action: 'search'}, target = window;
if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
- add_url += '&_framed=1';
+ url._framed = 1;
target = window.frames[this.env.contentframe];
this.contact_list.clear_selection();
}
- this.location_href(this.env.comm_path+'&_action=search'+add_url, target, true);
+ this.location_href(url, target, true);
return true;
};
@@ -4674,7 +4833,7 @@
{
if (this.env.search_request) {
var lock = this.set_busy(true, 'savedsearchdeleting');
- this.http_post('search-delete', '_sid='+urlencode(this.env.search_id), lock);
+ this.http_post('search-delete', {_sid: this.env.search_id}, lock);
}
};
@@ -4708,7 +4867,7 @@
// reset vars
this.env.current_page = 1;
- this.http_request('search', '_sid='+urlencode(id), lock);
+ this.http_request('search', {_sid: id}, lock);
};
@@ -4719,14 +4878,15 @@
// preferences section select and load options frame
this.section_select = function(list)
{
- var id = list.get_single_selection(), add_url = '', target = window;
+ var id = list.get_single_selection(), target = window,
+ url = {_action: 'edit-prefs', _section: id};
if (id) {
if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
- add_url = '&_framed=1';
+ url._framed = 1;
target = window.frames[this.env.contentframe];
}
- this.location_href(this.env.comm_path+'&_action=edit-prefs&_section='+id+add_url, target, true);
+ this.location_href(url, target, true);
}
return true;
@@ -4735,27 +4895,30 @@
this.identity_select = function(list)
{
var id;
- if (id = list.get_single_selection())
+ if (id = list.get_single_selection()) {
+ this.enable_command('delete', list.rowcount > 1 && this.env.identities_level < 2);
this.load_identity(id, 'edit-identity');
+ }
};
// load identity record
this.load_identity = function(id, action)
{
- if (action=='edit-identity' && (!id || id==this.env.iid))
+ if (action == 'edit-identity' && (!id || id == this.env.iid))
return false;
- var add_url = '', target = window;
+ var target = window,
+ url = {_action: action, _iid: id};
if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
- add_url = '&_framed=1';
+ url._framed = 1;
target = window.frames[this.env.contentframe];
document.getElementById(this.env.contentframe).style.visibility = 'inherit';
}
- if (action && (id || action=='add-identity')) {
+ if (action && (id || action == 'add-identity')) {
this.set_busy(true);
- this.location_href(this.env.comm_path+'&_action='+action+'&_iid='+id+add_url, target);
+ this.location_href(url, target);
}
return true;
@@ -4763,7 +4926,7 @@
this.delete_identity = function(id)
{
- // exit if no mailbox specified or if selection is empty
+ // exit if no identity is specified or if selection is empty
var selection = this.identity_list.get_selection();
if (!(selection.length || this.env.iid))
return;
@@ -4771,10 +4934,27 @@
if (!id)
id = this.env.iid ? this.env.iid : selection[0];
- // append token to request
- this.goto_url('delete-identity', '_iid='+id+'&_token='+this.env.request_token, true);
+ // submit request with appended token
+ if (confirm(this.get_label('deleteidentityconfirm')))
+ this.goto_url('delete-identity', { _iid: id, _token: this.env.request_token }, true);
return true;
+ };
+
+ this.update_identity_row = function(id, name, add)
+ {
+ var row, col, list = this.identity_list,
+ rid = this.html_identifier(id);
+
+ if (list.rows[rid] && (row = list.rows[rid].obj)) {
+ $(row.cells[0]).html(name);
+ }
+ else if (add) {
+ row = $('<tr>').attr('id', 'rcmrow'+rid).get(0);
+ col = $('<td>').addClass('mail').html(name).appendTo(row);
+ list.insert_row(row);
+ list.select(rid);
+ }
};
@@ -4863,7 +5043,7 @@
newname = this.env.dstfolder === '' ? basename : this.env.dstfolder+this.env.delimiter+basename;
if (newname != this.env.mailbox) {
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.mailbox)+'&_folder_newname='+urlencode(newname), this.set_busy(true, 'foldermoving'));
+ this.http_post('rename-folder', {_folder_oldname: this.env.mailbox, _folder_newname: newname}, this.set_busy(true, 'foldermoving'));
this.subscription_list.draglayer.hide();
}
}
@@ -4885,7 +5065,7 @@
if (folder && confirm(this.get_label('deletefolderconfirm'))) {
var lock = this.set_busy(true, 'folderdeleting');
- this.http_post('delete-folder', '_mbox='+urlencode(folder), lock);
+ this.http_post('delete-folder', {_mbox: folder}, lock);
}
};
@@ -4895,7 +5075,7 @@
if (!this.gui_objects.subscriptionlist)
return false;
- var row, n, i, tmp, folders, rowid, list = [], slist = [],
+ var row, n, i, tmp, tmp_name, folders, rowid, list = [], slist = [],
tbody = this.gui_objects.subscriptionlist.tBodies[0],
refrow = $('tr', tbody).get(1),
id = 'rcmrow'+((new Date).getTime());
@@ -4931,8 +5111,12 @@
for (n in folders) {
// protected folder
if (folders[n][2]) {
+ tmp_name = folders[n][0] + this.env.delimiter;
+ // prefix namespace cannot have subfolders (#1488349)
+ if (tmp_name == this.env.prefix_ns)
+ continue;
slist.push(folders[n][0]);
- tmp = folders[n][0]+this.env.delimiter;
+ tmp = tmp_name;
}
// protected folder's child
else if (tmp && folders[n][0].indexOf(tmp) == 0)
@@ -5079,7 +5263,7 @@
{
if (folder) {
var lock = this.display_message(this.get_label('foldersubscribing'), 'loading');
- this.http_post('subscribe', '_mbox='+urlencode(folder), lock);
+ this.http_post('subscribe', {_mbox: folder}, lock);
}
};
@@ -5087,7 +5271,7 @@
{
if (folder) {
var lock = this.display_message(this.get_label('folderunsubscribing'), 'loading');
- this.http_post('unsubscribe', '_mbox='+urlencode(folder), lock);
+ this.http_post('unsubscribe', {_mbox: folder}, lock);
}
};
@@ -5116,12 +5300,10 @@
url += '&_framed=1';
}
- if (String(target.location.href).indexOf(url) >= 0 && !force) {
+ if (String(target.location.href).indexOf(url) >= 0 && !force)
this.show_contentframe(true);
- }
- else {
+ else
this.location_href(this.env.comm_path+url, target, true);
- }
};
// disables subscription checkbox (for protected folder)
@@ -5135,7 +5317,7 @@
this.folder_size = function(folder)
{
var lock = this.set_busy(true, 'loading');
- this.http_post('folder-size', '_mbox='+urlencode(folder), lock);
+ this.http_post('folder-size', {_mbox: folder}, lock);
};
this.folder_size_update = function(size)
@@ -5210,7 +5392,7 @@
obj = document.getElementById(button.id);
// get default/passive setting of the button
- if (obj && button.type=='image' && !button.status) {
+ if (obj && button.type == 'image' && !button.status) {
button.pas = obj._original_src ? obj._original_src : obj.src;
// respect PNG fix on IE browsers
if (obj.runtimeStyle && obj.runtimeStyle.filter && obj.runtimeStyle.filter.match(/src=['"]([^'"]+)['"]/))
@@ -5220,7 +5402,7 @@
button.pas = String(obj.className);
// set image according to button state
- if (obj && button.type=='image' && button[state]) {
+ if (obj && button.type == 'image' && button[state]) {
button.status = state;
obj.src = button[state];
}
@@ -5318,22 +5500,6 @@
}
};
- this.focus_textfield = function(elem)
- {
- elem._hasfocus = true;
- var $elem = $(elem);
- if ($elem.hasClass('placeholder') || $elem.val() == elem._placeholder)
- $elem.val('').removeClass('placeholder').attr('spellcheck', true);
- };
-
- this.blur_textfield = function(elem)
- {
- elem._hasfocus = false;
- var $elem = $(elem);
- if (elem._placeholder && (!$elem.val() || $elem.val() == elem._placeholder))
- $elem.addClass('placeholder').attr('spellcheck', false).val(elem._placeholder);
- };
-
// write to the document/window title
this.set_pagetitle = function(title)
{
@@ -5383,7 +5549,7 @@
}
// add element and set timeout
this.messages[key].elements.push(id);
- window.setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
+ setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
return id;
}
@@ -5400,8 +5566,10 @@
obj.click(function() { return ref.hide_message(obj); });
}
+ this.triggerEvent('message', { message:msg, type:type, timeout:timeout, object:obj });
+
if (timeout > 0)
- window.setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
+ setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
return id;
};
@@ -5448,6 +5616,23 @@
}
}
}
+ };
+
+ // remove all messages immediately
+ this.clear_messages = function()
+ {
+ // pass command to parent window
+ if (this.is_framed())
+ return parent.rcmail.clear_messages();
+
+ var k, n, m = this.messages;
+
+ for (k in m)
+ for (n in m[k].elements)
+ if (m[k].obj)
+ m[k].obj.hide();
+
+ this.messages = {};
};
// mark a mailbox as selected and set environment variable
@@ -5578,13 +5763,11 @@
// replace content of quota display
this.set_quota = function(content)
{
- if (content && this.gui_objects.quotadisplay) {
- if (typeof content === 'object' && content.type == 'image')
- this.percent_indicator(this.gui_objects.quotadisplay, content);
- else
- $(this.gui_objects.quotadisplay).html(content.percent+'%').attr('title', content.title);
- }
+ if (this.gui_objects.quotadisplay && content && content.type == 'text')
+ $(this.gui_objects.quotadisplay).html(content.percent+'%').attr('title', content.title);
+
this.triggerEvent('setquota', content);
+ this.env.quota_content = content;
};
// update the mailboxlist
@@ -5666,96 +5849,33 @@
};
// display all-headers row and fetch raw message headers
- this.load_headers = function(elem)
+ this.show_headers = function(props, elem)
{
if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box || !this.env.uid)
return;
$(elem).removeClass('show-headers').addClass('hide-headers');
$(this.gui_objects.all_headers_row).show();
- elem.onclick = function() { rcmail.hide_headers(elem); };
+ elem.onclick = function() { rcmail.command('hide-headers', '', elem); };
// fetch headers only once
if (!this.gui_objects.all_headers_box.innerHTML) {
var lock = this.display_message(this.get_label('loading'), 'loading');
- this.http_post('headers', '_uid='+this.env.uid, lock);
+ this.http_post('headers', {_uid: this.env.uid}, lock);
}
};
// hide all-headers row
- this.hide_headers = function(elem)
+ this.hide_headers = function(props, elem)
{
if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box)
return;
$(elem).removeClass('hide-headers').addClass('show-headers');
$(this.gui_objects.all_headers_row).hide();
- elem.onclick = function() { rcmail.load_headers(elem); };
+ elem.onclick = function() { rcmail.command('show-headers', '', elem); };
};
- // percent (quota) indicator
- this.percent_indicator = function(obj, data)
- {
- if (!data || !obj)
- return false;
-
- var limit_high = 80,
- limit_mid = 55,
- width = data.width ? data.width : this.env.indicator_width ? this.env.indicator_width : 100,
- height = data.height ? data.height : this.env.indicator_height ? this.env.indicator_height : 14,
- quota = data.percent ? Math.abs(parseInt(data.percent)) : 0,
- quota_width = parseInt(quota / 100 * width),
- pos = $(obj).position();
-
- // workarounds for Opera and Webkit bugs
- pos.top = Math.max(0, pos.top);
- pos.left = Math.max(0, pos.left);
-
- this.env.indicator_width = width;
- this.env.indicator_height = height;
-
- // overlimit
- if (quota_width > width) {
- quota_width = width;
- quota = 100;
- }
-
- if (data.title)
- data.title = this.get_label('quota') + ': ' + data.title;
-
- // main div
- var main = $('<div>');
- main.css({position: 'absolute', top: pos.top, left: pos.left,
- width: width + 'px', height: height + 'px', zIndex: 100, lineHeight: height + 'px'})
- .attr('title', data.title).addClass('quota_text').html(quota + '%');
- // used bar
- var bar1 = $('<div>');
- bar1.css({position: 'absolute', top: pos.top + 1, left: pos.left + 1,
- width: quota_width + 'px', height: height + 'px', zIndex: 99});
- // background
- var bar2 = $('<div>');
- bar2.css({position: 'absolute', top: pos.top + 1, left: pos.left + 1,
- width: width + 'px', height: height + 'px', zIndex: 98})
- .addClass('quota_bg');
-
- if (quota >= limit_high) {
- main.addClass(' quota_text_high');
- bar1.addClass('quota_high');
- }
- else if(quota >= limit_mid) {
- main.addClass(' quota_text_mid');
- bar1.addClass('quota_mid');
- }
- else {
- main.addClass(' quota_text_low');
- bar1.addClass('quota_low');
- }
-
- // replace quota image
- $(obj).html('').append(bar1).append(bar2).append(main);
- // update #quotaimg title
- $('#quotaimg').attr('title', data.title);
- };
/********************************************************/
/********* html to text conversion functions *********/
@@ -5805,7 +5925,7 @@
else
query._action = this.env.action;
- var base = this.env.comm_path;
+ var base = this.env.comm_path, k, param = {};
// overwrite task name
if (query._action.match(/([a-z]+)\/([a-z0-9-_.]+)/)) {
@@ -5814,8 +5934,7 @@
}
// remove undefined values
- var param = {};
- for (var k in query) {
+ for (k in query) {
if (query[k] !== undefined && query[k] !== null)
param[k] = query[k];
}
@@ -5843,6 +5962,9 @@
{
if (frame)
this.lock_frame();
+
+ if (typeof url == 'object')
+ url = this.env.comm_path + '&' + $.param(url);
// simulate real link click to force IE to send referer header
if (bw.ie && target == window)
@@ -5875,7 +5997,7 @@
return $.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); }
+ error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
});
};
@@ -5907,7 +6029,7 @@
return $.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); }
+ error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
});
};
@@ -6013,7 +6135,7 @@
this.enable_command('purge', this.purge_mailbox_test());
this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount);
- if (response.action == 'list' || response.action == 'search') {
+ if ((response.action == 'list' || response.action == 'search') && this.message_list) {
this.msglist_select(this.message_list);
this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
}
@@ -6039,7 +6161,7 @@
};
// handle HTTP request errors
- this.http_error = function(request, status, err, lock)
+ this.http_error = function(request, status, err, lock, action)
{
var errmsg = request.statusText;
@@ -6048,6 +6170,16 @@
if (request.status && errmsg)
this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
+ else if (status == 'timeout')
+ this.display_message(this.get_label('requesttimedout'), 'error');
+ else if (request.status == 0 && status != 'abort')
+ this.display_message(this.get_label('servererror') + ' (No connection)', 'error');
+
+ // re-send keep-alive requests after 30 seconds
+ if (action == 'keep-alive')
+ setTimeout(function(){ ref.keep_alive(); }, 30000);
+ else if (action == 'check-recent')
+ setTimeout(function(){ ref.check_for_recent(false); }, 30000);
};
// post the given form to a hidden iframe
@@ -6098,15 +6230,133 @@
return frame_name;
};
+ // html5 file-drop API
+ this.document_drag_hover = function(e, over)
+ {
+ e.preventDefault();
+ $(ref.gui_objects.filedrop)[(over?'addClass':'removeClass')]('active');
+ };
+
+ this.file_drag_hover = function(e, over)
+ {
+ e.preventDefault();
+ e.stopPropagation();
+ $(ref.gui_objects.filedrop)[(over?'addClass':'removeClass')]('hover');
+ };
+
+ // handler when files are dropped to a designated area.
+ // compose a multipart form data and submit it to the server
+ this.file_dropped = function(e)
+ {
+ // abort event and reset UI
+ this.file_drag_hover(e, false);
+
+ // prepare multipart form data composition
+ var files = e.target.files || e.dataTransfer.files,
+ formdata = window.FormData ? new FormData() : null,
+ fieldname = this.env.filedrop.fieldname || '_file',
+ boundary = '------multipartformboundary' + (new Date).getTime(),
+ dashdash = '--', crlf = '\r\n',
+ multipart = dashdash + boundary + crlf;
+
+ if (!files || !files.length)
+ return;
+
+ // inline function to submit the files to the server
+ var submit_data = function() {
+ var multiple = files.length > 1,
+ ts = new Date().getTime(),
+ content = '<span>' + (multiple ? ref.get_label('uploadingmany') : files[0].name) + '</span>';
+
+ // add to attachments list
+ ref.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false });
+
+ // complete multipart content and post request
+ multipart += dashdash + boundary + dashdash + crlf;
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: ref.url(ref.env.filedrop.action||'upload', { _id:ref.env.compose_id||'', _uploadid:ts, _remote:1 }),
+ contentType: formdata ? false : 'multipart/form-data; boundary=' + boundary,
+ processData: false,
+ data: formdata || multipart,
+ beforeSend: function(xhr, s) { if (!formdata && xhr.sendAsBinary) xhr.send = xhr.sendAsBinary; },
+ success: function(data){ ref.http_response(data); },
+ error: function(o, status, err) { ref.http_error(o, status, err, null, 'attachment'); }
+ });
+ };
+
+ // get contents of all dropped files
+ var last = this.env.filedrop.single ? 0 : files.length - 1;
+ for (var i=0, f; i <= last && (f = files[i]); i++) {
+ if (!f.name) f.name = f.fileName;
+ if (!f.size) f.size = f.fileSize;
+ if (!f.type) f.type = 'application/octet-stream';
+
+ // binary encode file name
+ if (!formdata && /[^\x20-\x7E]/.test(f.name))
+ f.name_bin = unescape(encodeURIComponent(f.name));
+
+ if (this.env.filedrop.filter && !f.type.match(new RegExp(this.env.filedrop.filter))) {
+ // TODO: show message to user
+ continue;
+ }
+
+ // the easy way with FormData (FF4+, Chrome, Safari)
+ if (formdata) {
+ formdata.append(fieldname + '[]', f);
+ if (i == last)
+ return submit_data();
+ }
+ // use FileReader supporetd by Firefox 3.6
+ else if (window.FileReader) {
+ var reader = new FileReader();
+
+ // closure to pass file properties to async callback function
+ reader.onload = (function(file, i) {
+ return function(e) {
+ multipart += 'Content-Disposition: form-data; name="' + fieldname + '[]"';
+ multipart += '; filename="' + (f.name_bin || file.name) + '"' + crlf;
+ multipart += 'Content-Length: ' + file.size + crlf;
+ multipart += 'Content-Type: ' + file.type + crlf + crlf;
+ multipart += e.target.result + crlf;
+ multipart += dashdash + boundary + crlf;
+
+ if (i == last) // we're done, submit the data
+ return submit_data();
+ }
+ })(f,i);
+ reader.readAsBinaryString(f);
+ }
+ // Firefox 3
+ else if (f.getAsBinary) {
+ multipart += 'Content-Disposition: form-data; name="' + fieldname + '[]"';
+ multipart += '; filename="' + (f.name_bin || f.name) + '"' + crlf;
+ multipart += 'Content-Length: ' + f.size + crlf;
+ multipart += 'Content-Type: ' + f.type + crlf + crlf;
+ multipart += f.getAsBinary() + crlf;
+ multipart += dashdash + boundary +crlf;
+
+ if (i == last)
+ return submit_data();
+ }
+ }
+ };
+
+
// starts interval for keep-alive/check-recent signal
this.start_keepalive = function()
{
+ if (!this.env.keep_alive || this.env.framed)
+ return;
+
if (this._int)
clearInterval(this._int);
- if (this.env.keep_alive && !this.env.framed && this.task == 'mail' && this.gui_objects.mailboxlist)
+ if (this.task == 'mail' && this.gui_objects.mailboxlist)
this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
- else if (this.env.keep_alive && !this.env.framed && this.task != 'login' && this.env.action != 'print')
+ else if (this.task != 'login' && this.env.action != 'print')
this._int = setInterval(function(){ ref.keep_alive(); }, this.env.keep_alive * 1000);
};
@@ -6123,23 +6373,23 @@
if (this.busy)
return;
- var lock, addurl = '_mbox=' + urlencode(this.env.mailbox);
+ var lock, url = {_mbox: this.env.mailbox};
if (refresh) {
lock = this.set_busy(true, 'checkingmail');
- addurl += '&_refresh=1';
+ url._refresh = 1;
// reset check-recent interval
this.start_keepalive();
}
if (this.gui_objects.messagelist)
- addurl += '&_list=1';
+ url._list = 1;
if (this.gui_objects.quotadisplay)
- addurl += '&_quota=1';
+ url._quota = 1;
if (this.env.search_request)
- addurl += '&_search=' + this.env.search_request;
+ url._search = this.env.search_request;
- this.http_request('check-recent', addurl, lock);
+ this.http_request('check-recent', url, lock);
};
@@ -6167,7 +6417,7 @@
return obj.selectionEnd;
else if (document.selection && document.selection.createRange) {
var range = document.selection.createRange();
- if (range.parentElement()!=obj)
+ if (range.parentElement() != obj)
return 0;
var gm = range.duplicate();
@@ -6225,6 +6475,125 @@
}
};
+ this.mailto_handler_uri = function()
+ {
+ return location.href.split('?')[0] + '?_task=mail&_action=compose&_to=%s';
+ };
+
+ this.register_protocol_handler = function(name)
+ {
+ try {
+ window.navigator.registerProtocolHandler('mailto', this.mailto_handler_uri(), name);
+ }
+ catch(e) {};
+ };
+
+ this.check_protocol_handler = function(name, elem)
+ {
+ var nav = window.navigator;
+ if (!nav
+ || (typeof nav.registerProtocolHandler != 'function')
+ || ((typeof nav.isProtocolHandlerRegistered == 'function')
+ && nav.isProtocolHandlerRegistered('mailto', this.mailto_handler_uri()) == 'registered')
+ )
+ $(elem).addClass('disabled');
+ else
+ $(elem).click(function() { rcmail.register_protocol_handler(name); return false; });
+ };
+
+ // Checks browser capabilities eg. PDF support, TIF support
+ this.browser_capabilities_check = function()
+ {
+ if (!this.env.browser_capabilities)
+ this.env.browser_capabilities = {};
+
+ if (this.env.browser_capabilities.pdf === undefined)
+ this.env.browser_capabilities.pdf = this.pdf_support_check();
+
+ if (this.env.browser_capabilities.flash === undefined)
+ this.env.browser_capabilities.flash = this.flash_support_check();
+
+ if (this.env.browser_capabilities.tif === undefined)
+ this.tif_support_check();
+ };
+
+ // Returns browser capabilities string
+ this.browser_capabilities = function()
+ {
+ if (!this.env.browser_capabilities)
+ return '';
+
+ var n, ret = [];
+
+ for (n in this.env.browser_capabilities)
+ ret.push(n + '=' + this.env.browser_capabilities[n]);
+
+ return ret.join();
+ };
+
+ this.tif_support_check = function()
+ {
+ var img = new Image();
+
+ img.onload = function() { rcmail.env.browser_capabilities.tif = 1; };
+ img.onerror = function() { rcmail.env.browser_capabilities.tif = 0; };
+ img.src = 'program/blank.tif';
+ };
+
+ this.pdf_support_check = function()
+ {
+ var plugin = navigator.mimeTypes ? navigator.mimeTypes["application/pdf"] : {},
+ plugins = navigator.plugins,
+ len = plugins.length,
+ regex = /Adobe Reader|PDF|Acrobat/i;
+
+ if (plugin && plugin.enabledPlugin)
+ return 1;
+
+ if (window.ActiveXObject) {
+ try {
+ if (axObj = new ActiveXObject("AcroPDF.PDF"))
+ return 1;
+ }
+ catch (e) {}
+ try {
+ if (axObj = new ActiveXObject("PDF.PdfCtrl"))
+ return 1;
+ }
+ catch (e) {}
+ }
+
+ for (i=0; i<len; i++) {
+ plugin = plugins[i];
+ if (typeof plugin === 'String') {
+ if (regex.test(plugin))
+ return 1;
+ }
+ else if (plugin.name && regex.test(plugin.name))
+ return 1;
+ }
+
+ return 0;
+ };
+
+ this.flash_support_check = function()
+ {
+ var plugin = navigator.mimeTypes ? navigator.mimeTypes["application/x-shockwave-flash"] : {};
+
+ if (plugin && plugin.enabledPlugin)
+ return 1;
+
+ if (window.ActiveXObject) {
+ try {
+ if (axObj = new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))
+ return 1;
+ }
+ catch (e) {}
+ }
+
+ return 0;
+ };
+
} // end object rcube_webmail
@@ -6259,4 +6628,3 @@
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