From 745b1466fc76d5ded589e2469328086002430c1c Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Wed, 22 Feb 2006 16:58:00 -0500 Subject: [PATCH] Updated localizations --- program/js/app.js | 672 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 550 insertions(+), 122 deletions(-) diff --git a/program/js/app.js b/program/js/app.js index d65af42..3914fd3 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -6,13 +6,17 @@ | Copyright (C) 2005, RoundCube Dev, - Switzerland | | Licensed under the GNU GPL | | | - | Modified: 2005/11/13 (roundcube) | - | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | +-----------------------------------------------------------------------+ + + $Id$ */ +// Constants +var CONTROL_KEY = 1; +var SHIFT_KEY = 2; +var CONTROL_SHIFT_KEY = 3; var rcube_webmail_client; @@ -107,9 +111,11 @@ switch (this.task) { case 'mail': + var msg_list_frame = this.gui_objects.mailcontframe; var msg_list = this.gui_objects.messagelist; if (msg_list) { + msg_list_frame.onmousedown = function(e){return rcube_webmail_client.click_on_list(e);}; this.init_messagelist(msg_list); this.enable_command('markread', true); } @@ -137,7 +143,10 @@ this.enable_command('add-attachment', 'send-attachment', 'send', true); if (this.env.messagecount) - this.enable_command('select-all', 'select-none', 'sort', true); + this.enable_command('select-all', 'select-none', 'sort', 'expunge', true); + + if (this.env.messagecount && this.env.mailbox==this.env.trash_mailbox) + this.enable_command('purge', true); this.set_page_buttons(); @@ -151,15 +160,24 @@ // show printing dialog if (this.env.action=='print') window.print(); + + // get unread count for each mailbox + if (this.gui_objects.mailboxlist) + this.http_request('getunread', ''); break; case 'addressbook': - var contacts_list = this.gui_objects.contactslist; + var contacts_list = this.gui_objects.contactslist; + var ldap_contacts_list = this.gui_objects.ldapcontactslist; + if (contacts_list) this.init_contactslist(contacts_list); + if (ldap_contacts_list) + this.init_ldapsearchlist(ldap_contacts_list); + this.set_page_buttons(); if (this.env.cid) @@ -169,6 +187,9 @@ this.enable_command('save', true); this.enable_command('list', 'add', true); + + this.enable_command('ldappublicsearch', this.env.ldappublicsearch); + break; @@ -210,8 +231,13 @@ this.enable_command('logout', true); // disable browser's contextmenus - // document.oncontextmenu = function(){ return false; } + document.oncontextmenu = function(){ return false; } + // load body click event + document.onmousedown = function(){ return rcube_webmail_client.reset_click(); }; + document.onkeydown = function(e){ return rcube_webmail_client.use_arrow_keys(e, msg_list_frame); }; + + // flag object as complete this.loaded = true; @@ -219,17 +245,72 @@ if (this.pending_message) this.display_message(this.pending_message[0], this.pending_message[1]); - // start interval for keep-alive siganl - if (this.kepp_alive_interval) + // start interval for keep-alive/recent_check signal + if (this.kepp_alive_interval && this.task=='mail' && this.gui_objects.messagelist) + this.kepp_alive_int = setInterval(this.ref+'.check_for_recent()', this.kepp_alive_interval); + else this.kepp_alive_int = setInterval(this.ref+'.send_keep_alive()', this.kepp_alive_interval); }; + // reset last clicked if user clicks on anything other than the message table + this.reset_click = function() + { + this.in_message_list = false; + }; + + this.click_on_list = function(e) + { + if (!e) + e = window.event; + + this.in_message_list = true; + e.cancelBubble = true; + }; + + // reset last clicked if user clicks on anything other than the message table + this.use_arrow_keys = function(e, msg_list_frame) { + if (this.in_message_list != true) + return true; + + var keyCode = document.layers ? e.which : document.all ? event.keyCode : document.getElementById ? e.keyCode : 0; + var mod_key = this.get_modifier(e); + var scroll_to = 0; + + var last_selected_row = this.list_rows[this.last_selected]; + + if (keyCode == 40) { // down arrow key pressed + var new_row = last_selected_row.obj.nextSibling; + while (new_row && new_row.nodeType != 1) { + new_row = new_row.nextSibling; + } + if (!new_row) return false; + scroll_to = (Number(new_row.offsetTop) + Number(new_row.offsetHeight)) - Number(msg_list_frame.offsetHeight); + } else if (keyCode == 38) { // up arrow key pressed + var new_row = last_selected_row.obj.previousSibling; + while (new_row && new_row.nodeType != 1) { + new_row = new_row.previousSibling; + } + if (!new_row) return false; + scroll_to = new_row.offsetTop; + } else {return true;} + + if (mod_key != CONTROL_KEY) + this.select_row(new_row.uid,mod_key); + + if (((Number(new_row.offsetTop)) < (Number(msg_list_frame.scrollTop))) || + ((Number(new_row.offsetTop) + Number(new_row.offsetHeight)) > (Number(msg_list_frame.scrollTop) + Number(msg_list_frame.offsetHeight)))) { + msg_list_frame.scrollTop = scroll_to; + } + + return false; + }; // get all message rows from HTML table and init each row this.init_messagelist = function(msg_list) { if (msg_list && msg_list.tBodies[0]) { + this.message_rows = new Array(); var row; @@ -264,7 +345,10 @@ // set eventhandlers to table row row.onmousedown = function(e){ return rcube_webmail_client.drag_row(e, this.uid); }; row.onmouseup = function(e){ return rcube_webmail_client.click_row(e, this.uid); }; - + + if (document.all) + row.onselectstart = function() { return false; }; + // set eventhandler to message icon if ((msg_icon = row.cells[0].childNodes[0]) && row.cells[0].childNodes[0].nodeName=='IMG') { @@ -312,6 +396,9 @@ input_subject.focus(); else if (input_message) this.set_caret2start(input_message); // input_message.focus(); + + // get summary of all field values + this.cmp_hash = this.compose_field_hash(); }; @@ -361,7 +448,27 @@ this.list_rows = this.contact_rows; if (this.env.cid) - this.select(this.env.cid); + this.highlight_row(this.env.cid); + }; + + + // get all contact rows from HTML table and init each row + this.init_ldapsearchlist = function(ldap_contacts_list) + { + if (ldap_contacts_list && ldap_contacts_list.tBodies[0]) + { + this.ldap_contact_rows = new Array(); + + var row; + for(var r=0; r<ldap_contacts_list.tBodies[0].childNodes.length; r++) + { + row = ldap_contacts_list.tBodies[0].childNodes[r]; + this.init_table_row(row, 'ldap_contact_rows'); + } + } + + // alias to common rows array + this.list_rows = this.ldap_contact_rows; }; @@ -405,7 +512,7 @@ this.list_rows = this.identity_rows; if (this.env.iid) - this.select(this.env.iid); + this.highlight_row(this.env.iid); }; @@ -433,6 +540,15 @@ return false; } + + + // check input before leaving compose step + if (this.task=='mail' && this.env.action=='compose' && (command=='list' || command=='mail' || command=='addressbook' || command=='settings')) + { + if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning'))) + return false; + } + // process command switch (command) @@ -503,6 +619,17 @@ this.list_page('prev'); break; + case 'expunge': + if (this.env.messagecount) + this.expunge_mailbox(this.env.mailbox); + break; + + case 'purge': + case 'empty-mailbox': + if (this.env.messagecount) + this.purge_mailbox(this.env.mailbox); + break; + // common commands used in multiple tasks case 'show': @@ -522,7 +649,15 @@ case 'add': if (this.task=='addressbook') - this.load_contact(0, 'add'); + if (!window.frames[this.env.contentframe].rcmail) + this.load_contact(0, 'add'); + else + { + if (window.frames[this.env.contentframe].rcmail.selection.length) + this.add_ldap_contacts(); + else + this.load_contact(0, 'add'); + } else if (this.task=='settings') { this.clear_selection(); @@ -656,7 +791,8 @@ this.show_message(this.env.prev_uid); //location.href = this.env.comm_path+'&_action=show&_uid='+this.env.prev_uid+'&_mbox='+this.env.mailbox; break; - + + case 'compose': var url = this.env.comm_path+'&_action=compose'; @@ -673,65 +809,43 @@ // get selected contacts else { - for (var n=0; n<this.selection.length; n++) - a_cids[a_cids.length] = this.selection[n]; + if (!window.frames[this.env.contentframe].rcmail.selection.length) + { + for (var n=0; n<this.selection.length; n++) + a_cids[a_cids.length] = this.selection[n]; + } + else + { + var frameRcmail = window.frames[this.env.contentframe].rcmail; + // get the email address(es) + for (var n=0; n<frameRcmail.selection.length; n++) + a_cids[a_cids.length] = frameRcmail.ldap_contact_rows[frameRcmail.selection[n]].obj.cells[1].innerHTML; + } } - if (a_cids.length) url += '&_to='+a_cids.join(','); else break; + } else if (props) url += '&_to='+props; + + // don't know if this is necessary... + url = url.replace(/&_framed=1/, ""); this.set_busy(true); - location.href = url; - break; + + // need parent in case we are coming from the contact frame + parent.window.location.href = url; + break; case 'send': if (!this.gui_objects.messageform) break; - // check input fields - var input_to = rcube_find_object('_to'); - var input_subject = rcube_find_object('_subject'); - var input_message = rcube_find_object('_message'); - - // check for empty recipient - if (input_to && !rcube_check_email(input_to.value, true)) - { - alert(this.get_label('norecipientwarning')); - input_to.focus(); + if (!this.check_compose_input()) break; - } - - // display localized warning for missing subject - if (input_subject && input_subject.value == '') - { - var subject = prompt(this.get_label('nosubjectwarning'), this.get_label('nosubject')); - - // user hit cancel, so don't send - if (!subject && subject !== '') - { - input_subject.focus(); - break; - } - else - { - input_subject.value = subject ? subject : this.get_label('nosubject'); - } - } - - // check for empty body - if (input_message.value=='') - { - if (!confirm(this.get_label('nobodywarning'))) - { - input_message.focus(); - break; - } - } // all checks passed, send message this.set_busy(true, 'sendingmessage'); @@ -788,6 +902,15 @@ case 'add-contact': this.add_contact(props); break; + + + // ldap search + case 'ldappublicsearch': + if (this.gui_objects.ldappublicsearchform) + this.gui_objects.ldappublicsearchform.submit(); + else + this.ldappublicsearch(command); + break; // user settings commands @@ -945,11 +1068,12 @@ if (this.dont_select) return false; + // selects currently unselected row if (!this.in_selection_before) - { - var ctrl = this.check_ctrlkey(e); - this.select(id, ctrl); - } + { + var mod_key = this.get_modifier(e); + this.select_row(id,mod_key); + } if (this.selection.length) { @@ -965,8 +1089,7 @@ // onmouseup-handler of message list row this.click_row = function(e, id) { - var ctrl = this.check_ctrlkey(e); - + // don't do anything (another action processed before) if (this.dont_select) { @@ -974,27 +1097,59 @@ return false; } - if (!this.drag_active && this.in_selection_before==id) - this.select(id, (ctrl && this.task!='settings')); - + // unselects currently selected row + if (!this.drag_active && this.in_selection_before==id) { + var mod_key = this.get_modifier(e); + this.select_row(id,mod_key); + } this.drag_start = false; this.in_selection_before = false; // row was double clicked - if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked && !ctrl) + if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked) { this.show_message(id); return false; } else if (this.task=='addressbook') { - if (this.selection.length==1 && this.env.contentframe) + if (this.contact_rows && this.selection.length==1) + { this.load_contact(this.selection[0], 'show', true); - else if (this.task=='addressbook' && this.list_rows && this.list_rows[id].clicked) + // change the text for the add contact button + var links = parent.document.getElementById('abooktoolbar').getElementsByTagName('A'); + for (i = 0; i < links.length; i++) + { + var onclickstring = new String(links[i].onclick); + if (onclickstring.search('\"add\"') != -1) + links[i].title = this.env.newcontact; + } + } + else if (this.contact_rows && this.contact_rows[id].clicked) { this.load_contact(id, 'show'); return false; } + else if (this.ldap_contact_rows && !this.ldap_contact_rows[id].clicked) + { + // clear selection + parent.rcmail.clear_selection(); + + // disable delete + parent.rcmail.set_button('delete', 'pas'); + + // change the text for the add contact button + var links = parent.document.getElementById('abooktoolbar').getElementsByTagName('A'); + for (i = 0; i < links.length; i++) + { + var onclickstring = new String(links[i].onclick); + if (onclickstring.search('\"add\"') != -1) + links[i].title = this.env.addcontact; + } + } + // handle double click event + else if (this.ldap_contact_rows && this.selection.length==1 && this.ldap_contact_rows[id].clicked) + this.command('compose', this.ldap_contact_rows[id].obj.cells[1].innerHTML); else if (this.env.contentframe) { var elm = document.getElementById(this.env.contentframe); @@ -1015,14 +1170,12 @@ - /*********************************************************/ /********* (message) list functionality *********/ /*********************************************************/ - - // select/unselect a row - this.select = function(id, multiple) + // highlight/unhighlight a row + this.highlight_row = function(id, multiple) { var selected = false @@ -1049,7 +1202,6 @@ this.selection = a_pre.concat(a_post); this.set_classname(this.list_rows[id].obj, 'selected', false); } - selected = (this.selection.length==1); } @@ -1066,6 +1218,54 @@ } }; + +// selects or unselects the proper row depending on the modifier key pressed + this.select_row = function(id,mod_key) { + if (!mod_key) { + this.shift_start = id; + this.highlight_row(id, false); + } else { + switch (mod_key) { + case SHIFT_KEY: { + this.shift_select(id,false); + break; } + case CONTROL_KEY: { + this.shift_start = id; + this.highlight_row(id, true); + break; + } + case CONTROL_SHIFT_KEY: { + this.shift_select(id,true); + break; + } + default: { + this.highlight_row(id, false); + break; + } + } + } + this.last_selected = id; + }; + + this.shift_select = function(id, control) { + var from_rowIndex = this.list_rows[this.shift_start].obj.rowIndex; + var to_rowIndex = this.list_rows[id].obj.rowIndex; + + var i = ((from_rowIndex < to_rowIndex)? from_rowIndex : to_rowIndex); + var j = ((from_rowIndex > to_rowIndex)? from_rowIndex : to_rowIndex); + + // iterate through the entire message list + for (var n in this.list_rows) { + if ((this.list_rows[n].obj.rowIndex >= i) && (this.list_rows[n].obj.rowIndex <= j)) { + if (!this.in_selection(n)) + this.highlight_row(n, true); + } else { + if (this.in_selection(n) && !control) + this.highlight_row(n, true); + } + } + }; + this.clear_selection = function() { @@ -1099,7 +1299,7 @@ for (var n in this.list_rows) if (!filter || this.list_rows[n][filter]==true) - this.select(n, true); + this.highlight_row(n, true); }; @@ -1196,14 +1396,8 @@ // send remote request to load message list this.list_mailbox_remote = function(mbox, page, add_url) { - // clear message list - var table = this.gui_objects.messagelist; - var tbody = document.createElement('TBODY'); - table.insertBefore(tbody, table.tBodies[0]); - table.removeChild(table.tBodies[1]); - - this.message_rows = new Array(); - this.list_rows = this.message_rows; + // clear message list first + this.clear_message_list(); // send request to server var url = '_mbox='+escape(mbox)+(page ? '&_page='+page : ''); @@ -1211,6 +1405,60 @@ this.http_request('list', url+add_url, true); }; + + this.clear_message_list = function() + { + var table = this.gui_objects.messagelist; + var tbody = document.createElement('TBODY'); + table.insertBefore(tbody, table.tBodies[0]); + table.removeChild(table.tBodies[1]); + + this.message_rows = new Array(); + this.list_rows = this.message_rows; + + }; + + + this.expunge_mailbox = function(mbox) + { + var lock = false; + var add_url = ''; + + // lock interface if it's the active mailbox + if (mbox == this.env.mailbox) + { + lock = true; + this.set_busy(true, 'loading'); + add_url = '&_reload=1'; + } + + // send request to server + var url = '_mbox='+escape(mbox); + this.http_request('expunge', url+add_url, lock); + }; + + + this.purge_mailbox = function(mbox) + { + var lock = false; + var add_url = ''; + + if (!confirm(this.get_label('purgefolderconfirm'))) + return false; + + // lock interface if it's the active mailbox + if (mbox == this.env.mailbox) + { + lock = true; + this.set_busy(true, 'loading'); + add_url = '&_reload=1'; + } + + // send request to server + var url = '_mbox='+escape(mbox); + this.http_request('purge', url+add_url, lock); + }; + // move selected messages to the specified mailbox this.move_messages = function(mbox) @@ -1348,6 +1596,78 @@ /*********************************************************/ + // checks the input fields before sending a message + this.check_compose_input = function() + { + // check input fields + var input_to = rcube_find_object('_to'); + var input_subject = rcube_find_object('_subject'); + var input_message = rcube_find_object('_message'); + + // check for empty recipient + if (input_to && !rcube_check_email(input_to.value, true)) + { + alert(this.get_label('norecipientwarning')); + input_to.focus(); + return false; + } + + // display localized warning for missing subject + if (input_subject && input_subject.value == '') + { + var subject = prompt(this.get_label('nosubjectwarning'), this.get_label('nosubject')); + + // user hit cancel, so don't send + if (!subject && subject !== '') + { + input_subject.focus(); + return false; + } + else + { + input_subject.value = subject ? subject : this.get_label('nosubject'); + } + } + + // check for empty body + if (input_message.value=='') + { + if (!confirm(this.get_label('nobodywarning'))) + { + input_message.focus(); + return false; + } + } + + return true; + }; + + + this.compose_field_hash = function() + { + // check input fields + var input_to = rcube_find_object('_to'); + var input_cc = rcube_find_object('_to'); + var input_bcc = rcube_find_object('_to'); + var input_subject = rcube_find_object('_subject'); + var input_message = rcube_find_object('_message'); + + var str = ''; + if (input_to && input_to.value) + str += input_to.value+':'; + if (input_cc && input_cc.value) + str += input_cc.value+':'; + if (input_bcc && input_bcc.value) + str += input_bcc.value+':'; + if (input_subject && input_subject.value) + str += input_subject.value+':'; + if (input_message && input_message.value) + str += input_message.value; + + return str; + }; + + this.change_identity = function(obj) { if (!obj || !obj.options) @@ -1356,24 +1676,30 @@ var id = obj.options[obj.selectedIndex].value; var input_message = rcube_find_object('_message'); var message = input_message ? input_message.value : ''; + var sig, p; // remove the 'old' signature if (this.env.identity && this.env.signatures && this.env.signatures[this.env.identity]) { - var sig = this.env.signatures[this.env.identity]; - - if (p = message.lastIndexOf(sig)) + sig = this.env.signatures[this.env.identity]; + if (sig.indexOf('-- ')!=0) + sig = '-- \n'+sig; + + p = message.lastIndexOf(sig); + if (p>=0) message = message.substring(0, p-1) + message.substring(p+sig.length, message.length); } // add the new signature string if (this.env.signatures && this.env.signatures[id]) { - var sig = this.env.signatures[id]; + sig = this.env.signatures[id]; + if (sig.indexOf('-- ')!=0) + sig = '-- \n'+sig; message += '\n'+sig; } - if (input_message && message) + if (input_message) input_message.value = message; this.env.identity = id; @@ -1767,6 +2093,7 @@ return false; //if (this.env.framed && add_url=='') + // add_url = '&_framed=1'; if (action && (cid || action=='add')) @@ -1780,9 +2107,9 @@ this.delete_contacts = function() { // exit if no mailbox specified or if selection is empty - if (!(this.selection.length || this.env.cid)) + if (!(this.selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm'))) return; - + var a_cids = new Array(); if (this.env.cid) @@ -1825,6 +2152,50 @@ row.cells[c].innerHTML = cols_arr[c]; }; + + + // load ldap search form + this.ldappublicsearch = function(action) + { + var add_url = ''; + var target = window; + if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) + { + add_url = '&_framed=1'; + target = window.frames[this.env.contentframe]; + document.getElementById(this.env.contentframe).style.visibility = 'inherit'; + } + else + return false; + + + if (action == 'ldappublicsearch') + target.location.href = this.env.comm_path+'&_action='+action+add_url; + }; + + // add ldap contacts to address book + this.add_ldap_contacts = function() + { + if (window.frames[this.env.contentframe].rcmail) + { + var frame = window.frames[this.env.contentframe]; + + // build the url + var url = '&_framed=1'; + var emails = '&_emails='; + var names = '&_names='; + var end = ''; + for (var n=0; n<frame.rcmail.selection.length; n++) + { + end = n < frame.rcmail.selection.length - 1 ? ',' : ''; + emails += frame.rcmail.ldap_contact_rows[frame.rcmail.selection[n]].obj.cells[1].innerHTML + end; + names += frame.rcmail.ldap_contact_rows[frame.rcmail.selection[n]].obj.cells[0].innerHTML + end; + } + + frame.location.href = this.env.comm_path + '&_action=save&_framed=1' + emails + names; + } + return false; + } @@ -2213,7 +2584,7 @@ // create a table row in the message list - this.add_message_row = function(uid, cols, flags, attachment) + this.add_message_row = function(uid, cols, flags, attachment, attop) { if (!this.gui_objects.messagelist || !this.gui_objects.messagelist.tBodies[0]) return false; @@ -2227,8 +2598,8 @@ var row = document.createElement('TR'); row.id = 'rcmrow'+uid; - row.className = 'message '+(even ? 'even' : 'odd')+(flags.unread ? ' unread' : ''); - + row.className = 'message '+(even ? 'even' : 'odd')+(flags.unread ? ' unread' : '')+(flags.deleted ? ' deleted' : ''); + if (this.in_selection(uid)) row.className += ' selected'; @@ -2254,7 +2625,11 @@ col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" border="0" />' : ''; row.appendChild(col); - tbody.appendChild(row); + if (attop && tbody.rows.length) + tbody.insertBefore(row, tbody.firstChild); + else + tbody.appendChild(row); + this.init_message_row(row); }; @@ -2269,37 +2644,53 @@ this.set_page_buttons(); }; + // replace content of quota display + this.set_quota = function(text) + { + if (this.gui_objects.quotadisplay) + this.gui_objects.quotadisplay.innerHTML = text; + }; + // update the mailboxlist - this.set_unread_count = function(mbox, count) + this.set_unread_count = function(mbox, count, set_title) { if (!this.gui_objects.mailboxlist) return false; - mbox = String(mbox).toLowerCase().replace(this.mbox_expression, ''); - var item, reg, text_obj; - for (var n=0; n<this.gui_objects.mailboxlist.childNodes.length; n++) + mbox = String(mbox).toLowerCase().replace(this.mbox_expression, ''); + item = document.getElementById('rcmbx'+mbox); + + if (item && item.className && item.className.indexOf('mailbox '+mbox)>=0) { - item = this.gui_objects.mailboxlist.childNodes[n]; + // set new text + text_obj = item.firstChild; + reg = /\s+\([0-9]+\)$/i; - if (item.className && item.className.indexOf('mailbox '+mbox)>=0) - { - // set new text - text_obj = item.firstChild; - reg = /\s+\([0-9]+\)$/i; - - if (count && text_obj.innerHTML.match(reg)) - text_obj.innerHTML = text_obj.innerHTML.replace(reg, ' ('+count+')'); - else if (count) - text_obj.innerHTML += ' ('+count+')'; - else - text_obj.innerHTML = text_obj.innerHTML.replace(reg, ''); + if (count && text_obj.innerHTML.match(reg)) + text_obj.innerHTML = text_obj.innerHTML.replace(reg, ' ('+count+')'); + else if (count) + text_obj.innerHTML += ' ('+count+')'; + else + text_obj.innerHTML = text_obj.innerHTML.replace(reg, ''); - // set the right classes - this.set_classname(item, 'unread', count>0 ? true : false); - break; - } + // set the right classes + this.set_classname(item, 'unread', count>0 ? true : false); + } + + // set unread count to window title + if ((set_title || mbox==this.env.mailbox) && document.title) + { + var doc_title = String(document.title); + reg = /^\([0-9]+\)\s+/i; + + if (count && doc_title.match(reg)) + document.title = doc_title.replace(reg, '('+count+') '); + else if (count) + document.title = '('+count+') '+doc_title; + else + document.title = doc_title.replace(reg, ''); } }; @@ -2463,11 +2854,11 @@ if (request_obj.__lock) this.set_busy(false); - console(request_obj.responseText); + console(request_obj.get_text()); // if we get javascript code from server -> execute it - if (request_obj.responseText && (ctype=='text/javascript' || ctype=='application/x-javascript')) - eval(request_obj.responseText); + if (request_obj.get_text() && (ctype=='text/javascript' || ctype=='application/x-javascript')) + eval(request_obj.get_text()); // process the response data according to the sent action switch (request_obj.__action) @@ -2477,10 +2868,14 @@ if (this.env.action=='show') this.command('list'); break; - + case 'list': - this.enable_command('select-all', 'select-none', this.env.messagecount ? true : false); - break; + if (this.env.messagecount) + this.enable_command('purge', (this.env.mailbox==this.env.trash_mailbox)); + + case 'expunge': + this.enable_command('select-all', 'select-none', 'expunge', this.env.messagecount ? true : false); + break; } request_obj.reset(); @@ -2506,7 +2901,14 @@ var d = new Date(); this.http_request('keep-alive', '_t='+d.getTime()); }; + + // send periodic request to check for recent messages + this.check_for_recent = function() + { + var d = new Date(); + this.http_request('check-recent', '_t='+d.getTime()); + }; /********************************************************/ @@ -2556,6 +2958,26 @@ else return false; } + + +// returns modifier key (constants defined at top of file) + this.get_modifier = function(e) + { + var opcode = 0; + if (e = e || window.event) + { + opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY); + return opcode; + } + if (e.cancelBubble) + { + e.cancelBubble = true; + e.returnValue = false; + } + else if (e.preventDefault) + e.preventDefault(); + } + this.get_mouse_pos = function(e) { @@ -2716,9 +3138,6 @@ else if(this.xmlhttp.readyState == 4) { - this.responseText = this.xmlhttp.responseText; - this.responseXML = this.xmlhttp.responseXML; - if(this.xmlhttp.status == 0) this.onabort(this); else if(this.xmlhttp.status == 200) @@ -2736,6 +3155,15 @@ return this.xmlhttp.getResponseHeader(name); }; + this.get_text = function() + { + return this.xmlhttp.responseText; + }; + + this.get_xml = function() + { + return this.xmlhttp.responseXML; + }; this.reset(); -- Gitblit v1.9.1