From c31360dbd7cc4024ccbfa280603fe7e3bc8f3291 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 13 Apr 2012 09:50:54 -0400
Subject: [PATCH] - Code improvements, handle post/get request arguments as objects
---
program/js/app.js | 642 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 356 insertions(+), 286 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index d406844..7bf4432 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -175,7 +175,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);
@@ -220,8 +220,7 @@
$(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',
@@ -232,8 +231,7 @@
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'));
}
@@ -261,11 +259,9 @@
$.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); };
@@ -284,7 +280,7 @@
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
@@ -303,11 +299,13 @@
// 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);
}
break;
@@ -572,16 +570,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':
@@ -863,6 +859,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') {
@@ -898,13 +897,18 @@
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':
@@ -956,7 +960,7 @@
case 'send-attachment':
// Reset the auto-save timer
self.clearTimeout(this.save_timer);
-
+
this.upload_file(props || this.gui_objects.uploadform);
break;
@@ -1232,8 +1236,8 @@
return url.replace(/(\?.*)$/, urldata);
}
- else
- return url + '?' + name + '=' + value;
+
+ return url + '?' + name + '=' + value;
};
this.is_framed = function()
@@ -1888,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;
@@ -1902,7 +1906,7 @@
if (this.env.threading != threads) {
update = 1;
- add_url += '&_threads=' + threads;
+ post_data._threads = threads;
}
if (cols && cols.length) {
@@ -1922,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
@@ -1967,7 +1971,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);
}
}
@@ -2030,23 +2034,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) {
@@ -2059,7 +2063,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);
@@ -2073,13 +2077,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);
}
};
@@ -2094,15 +2101,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
@@ -2127,8 +2139,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;
}
@@ -2313,38 +2325,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
@@ -2363,13 +2375,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;
}
};
@@ -2495,23 +2507,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
@@ -2525,19 +2537,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
@@ -2567,6 +2578,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
@@ -2589,14 +2603,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;
@@ -2628,18 +2645,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';
@@ -2647,7 +2665,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
@@ -2706,7 +2724,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
@@ -2715,9 +2733,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);
@@ -2727,7 +2745,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
@@ -2736,9 +2754,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
@@ -2776,7 +2794,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++)
@@ -2784,16 +2802,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;
@@ -2803,12 +2822,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);
}
}
@@ -2817,29 +2836,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;
};
@@ -2866,6 +2883,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 *********/
@@ -2873,24 +2903,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;
@@ -2898,11 +2927,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
@@ -2998,7 +3027,7 @@
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);
@@ -3007,7 +3036,7 @@
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];
@@ -3018,7 +3047,7 @@
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='+urlencode(this.env.source)+'&_gid='+urlencode(gid), false);
+ this.http_request('group-expand', {_source: this.env.source, _gid: gid}, false);
}
}
}
@@ -3116,8 +3145,9 @@
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);
@@ -3128,8 +3158,6 @@
}
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'))) {
@@ -3138,7 +3166,6 @@
this.html2plain(existingHtml, props.id);
}
tinyMCE.execCommand('mceRemoveControl', false, props.id);
- this.display_spellcheck_controls(true);
}
return true;
@@ -3147,43 +3174,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
@@ -3202,6 +3239,8 @@
sp.prepare(false, true);
sp.processData(data);
}
+
+ this.spellcheck_state();
}
this.set_draft_id = function(id)
@@ -3430,8 +3469,9 @@
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;
+ content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload" class="cancelupload">'
+ + (this.env.cancelicon ? '<img src="'+this.env.cancelicon+'" alt="" />' : this.get_label('cancel')) + '</a>' + content;
+
this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false });
// upload progress support
@@ -3517,7 +3557,7 @@
this.add_contact = function(value)
{
if (value)
- this.http_post('addcontact', '_address='+value);
+ this.http_post('addcontact', {_address: value});
return true;
};
@@ -3526,18 +3566,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};
}
@@ -3546,7 +3591,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;
@@ -3557,10 +3602,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['*'];
@@ -3568,14 +3613,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
@@ -3615,9 +3660,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;
@@ -3703,7 +3748,7 @@
if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].id) {
insert += this.env.contacts[id].name + this.env.recipients_delimiter;
this.group2expand[this.env.contacts[id].id] = $.extend({ input: this.ksearch_input }, this.env.contacts[id]);
- this.http_request('mail/group-expand', '_source='+urlencode(this.env.contacts[id].source)+'&_gid='+urlencode(this.env.contacts[id].id), false);
+ 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;
@@ -3777,6 +3822,7 @@
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';
@@ -3789,9 +3835,9 @@
if (threads > 1 && source === null)
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);
@@ -3869,11 +3915,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);
@@ -3986,6 +4032,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);
@@ -3995,7 +4045,7 @@
this.list_contacts = function(src, group, page)
{
- var folder, add_url = '',
+ var folder, url = {},
target = window;
if (!src)
@@ -4029,20 +4079,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
@@ -4052,18 +4104,21 @@
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(this.env.task == 'mail' ? 'list-contacts' : 'list', url, lock);
};
@@ -4079,10 +4134,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);
@@ -4098,12 +4153,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;
};
@@ -4111,11 +4169,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)
@@ -4127,19 +4185,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);
}
};
@@ -4152,7 +4209,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);
@@ -4168,18 +4227,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;
};
@@ -4216,7 +4274,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;
@@ -4225,7 +4283,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';
@@ -4308,7 +4366,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);
}
};
@@ -4345,6 +4403,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)
{
@@ -4359,11 +4436,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;
}
@@ -4489,12 +4566,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)
@@ -4509,8 +4587,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],
@@ -4663,15 +4748,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;
};
@@ -4744,7 +4829,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);
}
};
@@ -4778,7 +4863,7 @@
// reset vars
this.env.current_page = 1;
- this.http_request('search', '_sid='+urlencode(id), lock);
+ this.http_request('search', {_sid: id}, lock);
};
@@ -4789,14 +4874,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;
@@ -4817,17 +4903,18 @@
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')) {
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;
@@ -4952,7 +5039,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();
}
}
@@ -4974,7 +5061,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);
}
};
@@ -5172,7 +5259,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);
}
};
@@ -5180,7 +5267,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);
}
};
@@ -5209,12 +5296,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)
@@ -5228,7 +5313,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)
@@ -5303,7 +5388,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=['"]([^'"]+)['"]/))
@@ -5313,7 +5398,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];
}
@@ -5409,22 +5494,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
@@ -5788,7 +5857,7 @@
// 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);
}
};
@@ -5852,7 +5921,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-_.]+)/)) {
@@ -5861,8 +5930,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];
}
@@ -5890,6 +5958,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)
@@ -6170,23 +6241,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);
};
@@ -6332,4 +6403,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