From fba1f5ab813f2eb4bedc5d9c4a75e77bbaa90131 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 10 Dec 2007 10:27:19 -0500
Subject: [PATCH] New class rcube_user + send message disposition notification
---
program/js/app.js | 392 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 269 insertions(+), 123 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 125e44f..f0065ac 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -35,7 +35,7 @@
// webmail client settings
this.dblclick_time = 500;
- this.message_time = 5000;
+ this.message_time = 3000;
this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');
@@ -164,6 +164,9 @@
this.enable_command('firstmessage', true);
}
}
+
+ if (this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox)
+ this.set_alttext('delete', 'movemessagetotrash');
// make preview/message frame visible
if (this.env.action == 'preview' && this.env.framed && parent.rcmail)
@@ -200,8 +203,11 @@
this.set_page_buttons();
- // focus this window
- window.focus();
+ // focus main window
+ if (this.env.framed && window.parent)
+ window.parent.focus();
+ else
+ window.focus();
// init message compose form
if (this.env.action=='compose')
@@ -216,6 +222,16 @@
{
this.gui_objects.folderlist = this.gui_objects.mailboxlist;
this.http_request('getunread', '');
+ }
+
+ // 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');
}
break;
@@ -283,6 +299,9 @@
this.identity_list.highlight_row(this.env.iid);
}
+ if (this.gui_objects.subscriptionlist)
+ this.init_subscription_list();
+
break;
case 'login':
@@ -343,9 +362,9 @@
var uid = row.uid;
if (uid && this.env.messages[uid])
{
- row.deleted = this.env.messages[uid].deleted;
- row.unread = this.env.messages[uid].unread;
- row.replied = this.env.messages[uid].replied;
+ row.deleted = this.env.messages[uid].deleted ? true : false;
+ row.unread = this.env.messages[uid].unread ? true : false;
+ row.replied = this.env.messages[uid].replied ? true : false;
}
// set eventhandler to message icon
@@ -463,7 +482,7 @@
break;
case 'logout':
- this.goto_url('logout');
+ this.goto_url('logout', true);
break;
// commands to switch task
@@ -482,6 +501,9 @@
this.reset_qsearch();
this.list_mailbox(props);
+
+ if (this.env.trash_mailbox)
+ this.set_alttext('delete', this.env.mailbox != this.env.trash_mailbox ? 'movemessagetotrash' : 'deletemessage');
}
else if (this.task=='addressbook')
{
@@ -694,7 +716,7 @@
}
}
- this.goto_url('get', qstring+'&_download=1');
+ this.goto_url('get', qstring+'&_download=1', false);
break;
case 'select-all':
@@ -798,6 +820,7 @@
this.set_busy(true, 'savingmessage');
var form = this.gui_objects.messageform;
form.target = "savetarget";
+ form._draft.value = '1';
form.submit();
break;
@@ -928,8 +951,7 @@
break;
case 'delete-folder':
- if (confirm(this.get_label('deletefolderconfirm')))
- this.delete_folder(props);
+ this.delete_folder(props);
break;
}
@@ -968,7 +990,7 @@
this.display_message(msg, 'loading', true);
}
- else if (!a && this.busy)
+ else if (!a)
this.hide_message();
this.busy = a;
@@ -1063,7 +1085,9 @@
this.unfocus_folder(id);
this.command('moveto', id);
}
-
+
+ // Hide message command buttons until a message is selected
+ this.enable_command('reply', 'reply-all', 'forward', 'delete', 'print', false);
return false;
};
@@ -1088,15 +1112,18 @@
clearTimeout(this.preview_timer);
var selected = list.selection.length==1;
+
+ // Hide certain command buttons when Drafts folder is selected
if (this.env.mailbox == this.env.drafts_mailbox)
{
+ this.enable_command('reply', 'reply-all', 'forward', false);
this.enable_command('show', selected);
- this.enable_command('delete', 'moveto', list.selection.length>0 ? true : false);
+ this.enable_command('delete', 'moveto', (list.selection.length > 0 ? true : false));
}
else
{
this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected);
- this.enable_command('delete', 'moveto', list.selection.length>0 ? true : false);
+ this.enable_command('delete', 'moveto', (list.selection.length > 0 ? true : false));
}
// start timer for message preview (wait for double click)
@@ -1126,6 +1153,8 @@
this.command('show');
else if (list.key_pressed == list.DELETE_KEY)
this.command('delete');
+ else
+ list.shiftkey = false;
};
@@ -1145,6 +1174,8 @@
return (id != this.env.mailbox);
else if (this.task == 'addressbook')
return (id != this.env.source && this.env.address_sources[id] && !this.env.address_sources[id].readonly);
+ else if (this.task == 'settings')
+ return (id != this.env.folder);
};
@@ -1244,12 +1275,14 @@
if (!page && mbox != this.env.mailbox)
{
page = 1;
- add_url += '&_refresh=1';
this.env.current_page = page;
if (this.message_list)
this.message_list.clear_selection();
this.show_contentframe(false);
}
+
+ if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
+ add_url += '&_refresh=1';
this.select_folder(mbox, this.env.mailbox);
this.env.mailbox = mbox;
@@ -1304,7 +1337,7 @@
// send request to server
var url = '_mbox='+urlencode(mbox);
- this.http_request('expunge', url+add_url, lock);
+ this.http_post('expunge', url+add_url, lock);
};
@@ -1326,7 +1359,7 @@
// send request to server
var url = '_mbox='+urlencode(mbox);
- this.http_request('purge', url+add_url, lock);
+ this.http_post('purge', url+add_url, lock);
return true;
};
@@ -1421,10 +1454,8 @@
{
id = selection[n];
a_uids[a_uids.length] = id;
- this.message_list.remove_row(id);
+ this.message_list.remove_row(id, (n == selection.length-1));
}
-
- this.message_list.select_next();
}
// also send search request to get the right messages
@@ -1432,7 +1463,7 @@
add_url += '&_search='+this.env.search_request;
// send request to server
- this.http_request(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
+ this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
};
@@ -1511,7 +1542,7 @@
}
}
- this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+ this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
};
// mark all message rows as deleted/undeleted
@@ -1588,7 +1619,7 @@
}
}
- this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
+ this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
return true;
};
@@ -1615,7 +1646,7 @@
}
}
- this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag=delete');
+ this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete');
return true;
};
@@ -1653,7 +1684,7 @@
var input_message = rcube_find_object('_message');
// check for empty recipient
- if (input_to && !rcube_check_email(input_to.value, true))
+ if (input_to && !rcube_check_email(input_to.value.replace(/^\s+/, '').replace(/[\s,;]+$/, ''), true))
{
alert(this.get_label('norecipientwarning'));
input_to.focus();
@@ -1678,13 +1709,10 @@
}
// check for empty body
- if ((input_message.value=='')&&(tinyMCE.getContent()==''))
+ if ((input_message.value == '' && (!window.tinyMCE || tinyMCE.getContent() == '')) && !confirm(this.get_label('nobodywarning')))
{
- if (!confirm(this.get_label('nobodywarning')))
- {
- input_message.focus();
- return false;
- }
+ input_message.focus();
+ return false;
}
return true;
@@ -1709,6 +1737,9 @@
{
if (this.env.draft_autosave)
this.save_timer = self.setTimeout(function(){ ref.command("savedraft"); }, this.env.draft_autosave * 1000);
+
+ // Unlock interface now that saving is complete
+ this.busy = false;
};
@@ -1840,8 +1871,11 @@
}
// clear upload form
- if (!a && this.gui_objects.attachmentform && this.gui_objects.attachmentform!=this.gui_objects.messageform)
- this.gui_objects.attachmentform.reset();
+ try {
+ if (!a && this.gui_objects.attachmentform != this.gui_objects.messageform)
+ this.gui_objects.attachmentform.reset();
+ }
+ catch(e){} // ignore errors
return true;
};
@@ -1926,7 +1960,7 @@
this.remove_attachment = function(name)
{
if (name)
- this.http_request('remove-attachment', '_file='+urlencode(name));
+ this.http_post('remove-attachment', '_file='+urlencode(name));
return true;
};
@@ -2248,6 +2282,7 @@
{
page = 1;
this.env.current_page = page;
+ this.reset_qsearch();
}
this.select_folder(src, this.env.source);
@@ -2284,7 +2319,7 @@
this.enable_command('delete', 'compose', false);
// send request to server
- var url = (src ? '&_source='+urlencode(src) : '') + (page ? '&_page='+page : '');
+ var url = (src ? '_source='+urlencode(src) : '') + (page ? (src?'&':'') + '_page='+page : '');
this.env.source = src;
// also send search request to get the right messages
@@ -2347,7 +2382,7 @@
{
id = selection[n];
a_cids[a_cids.length] = id;
- this.contact_list.remove_row(id);
+ this.contact_list.remove_row(id, (n == selection.length-1));
}
// hide content frame if we delete the currently displayed contact
@@ -2356,7 +2391,7 @@
}
// send request to server
- this.http_request('delete', '_cid='+urlencode(a_cids.join(','))+'&_from='+(this.env.action ? this.env.action : ''));
+ this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_from='+(this.env.action ? this.env.action : ''));
return true;
};
@@ -2381,6 +2416,26 @@
/*********************************************************/
/********* user settings methods *********/
/*********************************************************/
+
+ this.init_subscription_list = function()
+ {
+ var p = this;
+ this.subscription_list = new rcube_list_widget(this.gui_objects.subscriptionlist, {multiselect:false, draggable:true, keyboard:false, toggleselect:true});
+ this.subscription_list.addEventListener('select', function(o){ p.subscription_select(o); });
+ this.subscription_list.addEventListener('dragstart', function(o){ p.drag_active = true; });
+ this.subscription_list.addEventListener('dragend', function(o){ p.subscription_move_folder(o); });
+ this.subscription_list.row_init = function (row)
+ {
+ var anchors = row.obj.getElementsByTagName('A');
+ if (anchors[0])
+ anchors[0].onclick = function() { p.rename_folder(row.id); return false; };
+ if (anchors[1])
+ anchors[1].onclick = function() { p.delete_folder(row.id); return false; };
+ row.obj.onmouseover = function() { p.focus_subscription(row.id); };
+ row.obj.onmouseout = function() { p.unfocus_subscription(row.id); };
+ }
+ this.subscription_list.init();
+ }
this.identity_select = function(list)
{
@@ -2429,6 +2484,72 @@
};
+ this.focus_subscription = function(id)
+ {
+ var row, folder;
+ var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
+
+ if (this.drag_active && (row = document.getElementById(id)))
+ if (this.env.subscriptionrows[id] &&
+ (folder = this.env.subscriptionrows[id][0]))
+ {
+ if (this.check_droptarget(folder) &&
+ (folder != this.env.folder.replace(reg, '')) &&
+ (!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter)))))
+ {
+ this.set_env('dstfolder', folder);
+ this.set_classname(row, 'droptarget', true);
+ }
+ }
+ else if (this.env.folder.match(new RegExp(RegExp.escape(this.env.delimiter))))
+ {
+ this.set_env('dstfolder', this.env.delimiter);
+ this.set_classname(this.subscription_list.frame, 'droptarget', true);
+ }
+ }
+
+
+ this.unfocus_subscription = function(id)
+ {
+ var row;
+ this.set_env('dstfolder', null);
+ if (this.env.subscriptionrows[id] &&
+ (row = document.getElementById(id)))
+ this.set_classname(row, 'droptarget', false);
+ else
+ this.set_classname(this.subscription_list.frame, 'droptarget', false);
+ }
+
+
+ this.subscription_select = function(list)
+ {
+ var id, folder;
+ if ((id = list.get_single_selection()) &&
+ this.env.subscriptionrows['rcmrow'+id] &&
+ (folder = this.env.subscriptionrows['rcmrow'+id][0]) &&
+ (find_in_array(this.env.defaultfolders, folder)!=0))
+ this.set_env('folder', folder);
+ else
+ this.set_env('folder', null);
+ };
+
+
+ this.subscription_move_folder = function(list)
+ {
+ var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
+ if (this.env.folder && this.env.dstfolder && (this.env.dstfolder != this.env.folder) &&
+ (this.env.dstfolder != this.env.folder.replace(reg, '')))
+ {
+ var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g');
+ var basename = this.env.folder.replace(reg, '');
+ var newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname));
+ }
+ this.drag_active = false;
+ this.unfocus_subscription(this.get_folder_row_id(this.env.dstfolder));
+ };
+
+
// tell server to create and subscribe a new mailbox
this.create_folder = function(name)
{
@@ -2438,41 +2559,21 @@
var form;
if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
name = form.elements['_folder_name'].value;
+ if (this.env.folder)
+ name = this.env.folder+this.env.delimiter+name;
if (name)
- this.http_request('create-folder', '_name='+urlencode(name), true);
+ this.http_post('create-folder', '_name='+urlencode(name), true);
else if (form.elements['_folder_name'])
form.elements['_folder_name'].focus();
};
- // entry point for folder renaming
- this.rename_folder = function(props)
- {
- var form, oldname, newname;
-
- // rename a specific mailbox
- if (props)
- this.edit_foldername(props);
-
- // use a dropdown and input field (old behavior)
- else if ((form = this.gui_objects.editform) && form.elements['_folder_oldname'] && form.elements['_folder_newname'])
- {
- oldname = form.elements['_folder_oldname'].value;
- newname = form.elements['_folder_newname'].value;
- }
-
- if (oldname && newname)
- this.http_request('rename-folder', '_folder_oldname='+urlencode(oldname)+'&_folder_newname='+urlencode(newname));
- };
-
-
- // start editing the mailbox name.
+ // start renaming the mailbox name.
// this will replace the name string with an input field
- this.edit_foldername = function(folder)
+ this.rename_folder = function(id)
{
var temp, row, form;
- var id = this.get_folder_row_id(folder);
// reset current renaming
if (temp = this.edit_folder)
@@ -2482,11 +2583,15 @@
return;
}
- if (id && (row = document.getElementById(id)))
+ if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id)))
{
+ var reg = new RegExp('.*['+RegExp.escape(this.env.delimiter)+']');
this.name_input = document.createElement('INPUT');
- this.name_input.value = this.env.subscriptionrows[id][1];
+ this.name_input.value = this.env.subscriptionrows[id][1].replace(reg, '');
this.name_input.style.width = '100%';
+
+ reg = new RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
+ this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
this.name_input.onkeypress = function(e){ rcmail.name_input_keypress(e); };
row.cells[0].replaceChild(this.name_input, row.cells[0].firstChild);
@@ -2504,7 +2609,10 @@
{
var cell = this.name_input ? this.name_input.parentNode : null;
if (cell && this.edit_folder && this.env.subscriptionrows[this.edit_folder])
- cell.innerHTML = this.env.subscriptionrows[this.edit_folder][1];
+ {
+ var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g');
+ cell.innerHTML = this.env.subscriptionrows[this.edit_folder][1].replace(reg, ' ');
+ }
this.edit_folder = null;
};
@@ -2520,7 +2628,11 @@
{
var newname = this.name_input ? this.name_input.value : null;
if (this.edit_folder && newname)
- this.http_request('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname));
+ {
+ if (this.name_input.__parent)
+ newname = this.name_input.__parent + this.env.delimiter + newname;
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname));
+ }
}
// escape
else if (key==27)
@@ -2529,13 +2641,18 @@
// delete a specific mailbox with all its messages
- this.delete_folder = function(folder)
+ this.delete_folder = function(id)
{
- if (this.edit_folder)
- this.reset_folder_rename();
-
- if (folder)
- this.http_request('delete-folder', '_mboxes='+urlencode(folder));
+ var folder = this.env.subscriptionrows[id][0];
+
+ if (this.edit_folder)
+ this.reset_folder_rename();
+
+ if (folder && confirm(this.get_label('deletefolderconfirm')))
+ {
+ this.http_post('delete-folder', '_mboxes='+urlencode(folder));
+ this.set_env('folder', null);
+ }
};
@@ -2552,7 +2669,8 @@
var refrow, form;
var tbody = this.gui_objects.subscriptionlist.tBodies[0];
- var id = replace && replace.id ? replace.id : tbody.childNodes.length+1;
+ var id = replace && replace.id ? replace.id : 'rcmrow'+(tbody.childNodes.length+1);
+ var selection = this.subscription_list.get_single_selection();
if (!id || !(refrow = document.getElementById(refid)))
{
@@ -2563,7 +2681,7 @@
{
// clone a table row if there are existing rows
var row = this.clone_table_row(refrow);
- row.id = 'rcmrow'+id;
+ row.id = id;
if (replace)
tbody.replaceChild(row, replace);
else
@@ -2581,11 +2699,6 @@
row.cells[1].firstChild.checked = true;
}
- if (row.cells[2] && row.cells[2].firstChild.tagName=='A')
- row.cells[2].firstChild.onclick = new Function(this.ref+".command('rename-folder','"+name.replace('\'','\\\'')+"')");
- if (row.cells[3] && row.cells[3].firstChild.tagName=='A')
- row.cells[3].firstChild.onclick = new Function(this.ref+".command('delete-folder','"+name.replace('\'','\\\'')+"')");
-
// add new folder to rename-folder list and clear input field
if (!replace && (form = this.gui_objects.editform))
{
@@ -2596,6 +2709,12 @@
}
this.sort_subscription_list();
+ this.init_subscription_list();
+ if (selection && document.getElementById('rcmrow'+selection))
+ this.subscription_list.select_row(selection);
+
+ if (document.getElementById(id).scrollIntoView)
+ document.getElementById(id).scrollIntoView();
};
@@ -2607,7 +2726,6 @@
// replace an existing table row (if found)
this.add_folder_row(newfolder, display_name, row);
- this.env.subscriptionrows[id] = null;
// rename folder in rename-folder dropdown
var form, elm;
@@ -2662,7 +2780,7 @@
if ((form = this.gui_objects.editform) && form.elements['_unsubscribed'])
this.change_subscription('_unsubscribed', '_subscribed', 'subscribe');
else if (folder)
- this.http_request('subscribe', '_mboxes='+urlencode(folder));
+ this.http_post('subscribe', '_mboxes='+urlencode(folder));
};
@@ -2672,7 +2790,7 @@
if ((form = this.gui_objects.editform) && form.elements['_subscribed'])
this.change_subscription('_subscribed', '_unsubscribed', 'unsubscribe');
else if (folder)
- this.http_request('unsubscribe', '_mboxes='+urlencode(folder));
+ this.http_post('unsubscribe', '_mboxes='+urlencode(folder));
};
@@ -2706,7 +2824,7 @@
list_to[index] = new Option(a_folders[n]);
}
- this.http_request(action, '_mboxes='+urlencode(a_folders.join(',')));
+ this.http_post(action, '_mboxes='+urlencode(a_folders.join(',')));
}
}
@@ -2750,19 +2868,19 @@
var index = new Array();
var tbody = this.gui_objects.subscriptionlist.tBodies[0];
var swapped = false;
- for (var i = 0; i<(tbody.childNodes.length-1); i++)
+ for (var i = 0; i<tbody.childNodes.length; i++)
if (this.env.subscriptionrows[tbody.childNodes[i].id]!=null)
index.push(i);
for (i = 0; i<(index.length-1); i++)
{
- if (this.env.subscriptionrows[tbody.childNodes[index[i]].id][0]>
- this.env.subscriptionrows[tbody.childNodes[index[i+1]].id][0])
+ var one = tbody.childNodes[index[i]];
+ var two = tbody.childNodes[index[i+1]];
+ if (this.env.subscriptionrows[one.id][0].toLowerCase()>
+ this.env.subscriptionrows[two.id][0].toLowerCase())
{
- var swap = tbody.replaceChild(tbody.childNodes[index[i]], tbody.childNodes[index[i+1]]);
- if (typeof(tbody.childNodes[index[i]]) != 'undefined')
- tbody.insertBefore(swap, tbody.childNodes[index[i]])
- else
- tbody.appendChild(swap);
+ var swap = one.cloneNode(true);
+ tbody.replaceChild(swap, two);
+ tbody.replaceChild(two, one);
swapped = true;
}
}
@@ -2801,8 +2919,12 @@
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=['"]([^'"]+)['"]/))
+ button.pas = RegExp.$1;
+ }
else if (obj && !button.status)
button.pas = String(obj.className);
@@ -2827,6 +2949,28 @@
}
};
+ // display a specific alttext
+ this.set_alttext = function(command, label)
+ {
+ if (!this.buttons[command] || !this.buttons[command].length)
+ return;
+
+ var button, obj, link;
+ for (var n=0; n<this.buttons[command].length; n++)
+ {
+ button = this.buttons[command][n];
+ obj = document.getElementById(button.id);
+
+ if (button.type=='image' && obj)
+ {
+ obj.setAttribute('alt', this.get_label(label));
+ if ((link = obj.parentNode) && link.tagName == 'A')
+ link.setAttribute('title', this.get_label(label));
+ }
+ else if (obj)
+ obj.setAttribute('title', this.get_label(label));
+ }
+ };
// mouse over button
this.button_over = function(command, id)
@@ -2903,27 +3047,27 @@
};
- // display a specific alttext
- this.alttext = function(text)
- {
-
- };
+ // write to the document/window title
+ this.set_pagetitle = function(title)
+ {
+ if (title && document.title)
+ document.title = title;
+ }
// display a system message
this.display_message = function(msg, type, hold)
{
- // pass command to parent window
- if (this.env.framed && parent.rcmail )
- return parent.rcmail.display_message(msg, type, hold);
-
- this.set_busy(false);
if (!this.loaded) // save message in order to display after page loaded
{
this.pending_message = new Array(msg, type);
return true;
}
-
+
+ // pass command to parent window
+ if (this.env.framed && parent.rcmail)
+ return parent.rcmail.display_message(msg, type, hold);
+
if (!this.gui_objects.message)
return false;
@@ -2934,12 +3078,12 @@
if (type)
cont = '<div class="'+type+'">'+cont+'</div>';
- this.gui_objects.message._rcube = this;
+ var _rcube = this;
this.gui_objects.message.innerHTML = cont;
this.gui_objects.message.style.display = 'block';
-
+
if (type!='loading')
- this.gui_objects.message.onmousedown = function(){ this._rcube.hide_message(); return true; };
+ this.gui_objects.message.onmousedown = function(){ _rcube.hide_message(); return true; };
if (!hold)
this.message_timer = setTimeout(function(){ ref.hide_message(); }, this.message_time);
@@ -3097,9 +3241,6 @@
if (!this.gui_objects.mailboxlist)
return false;
- if (mbox==this.env.mailbox)
- set_title = true;
-
var reg, text_obj;
var item = this.get_folder_li(mbox);
mbox = String(mbox).toLowerCase().replace(this.identifier_expr, '');
@@ -3126,13 +3267,16 @@
if (set_title && document.title)
{
var doc_title = String(document.title);
+ var new_title = "";
if (count && doc_title.match(reg))
- document.title = doc_title.replace(reg, '('+count+') ');
+ new_title = doc_title.replace(reg, '('+count+') ');
else if (count)
- document.title = '('+count+') '+doc_title;
+ new_title = '('+count+') '+doc_title;
else
- document.title = doc_title.replace(reg, '');
+ new_title = doc_title.replace(reg, '');
+
+ this.set_pagetitle(new_title);
}
};
@@ -3186,9 +3330,11 @@
/********* remote request methods *********/
/********************************************************/
- this.redirect = function(url)
+ this.redirect = function(url, lock)
{
- this.set_busy(true);
+ if (lock || lock === null)
+ this.set_busy(true);
+
if (this.env.framed && window.parent)
parent.location.href = url;
else
@@ -3197,11 +3343,8 @@
this.goto_url = function(action, query, lock)
{
- if (lock)
- this.set_busy(true);
-
var querystring = query ? '&'+query : '';
- this.redirect(this.env.comm_path+'&_action='+action+querystring);
+ this.redirect(this.env.comm_path+'&_action='+action+querystring, lock);
};
@@ -3287,7 +3430,8 @@
ctype = ctype_array[0];
}
- this.set_busy(false);
+ if (request_obj.__lock)
+ this.set_busy(false);
console.log(request_obj.get_text());
@@ -3309,6 +3453,7 @@
case 'list':
if (this.env.messagecount)
this.enable_command('purge', (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox));
+ this.msglist_select(this.message_list);
case 'expunge':
this.enable_command('select-all', 'select-none', 'expunge', this.env.messagecount ? true : false);
@@ -3350,8 +3495,7 @@
}
this.set_busy(true, 'checkingmail');
- var d = new Date();
- this.http_request('check-recent', '_t='+d.getTime());
+ this.http_request('check-recent', (this.env.search_request ? '_search='+this.env.search_request+'&' : '') + '_t='+(new Date().getTime()), true);
};
@@ -3492,12 +3636,13 @@
return false;
}
- var ref = this;
+ var _ref = this;
this.url = url;
this.busy = true;
- this.xmlhttp.onreadystatechange = function(){ ref.xmlhttp_onreadystatechange(); };
+ this.xmlhttp.onreadystatechange = function(){ _ref.xmlhttp_onreadystatechange(); };
this.xmlhttp.open('GET', url);
+ this.xmlhttp.setRequestHeader('X-RoundCube-Referer', bw.get_cookie('roundcube_sessid'));
this.xmlhttp.send(null);
};
@@ -3531,6 +3676,7 @@
this.xmlhttp.onreadystatechange = function() { ref.xmlhttp_onreadystatechange(); };
this.xmlhttp.open('POST', url, true);
this.xmlhttp.setRequestHeader('Content-Type', contentType);
+ this.xmlhttp.setRequestHeader('X-RoundCube-Referer', bw.get_cookie('roundcube_sessid'));
this.xmlhttp.send(req_body);
};
--
Gitblit v1.9.1