banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- #1485290: Fix unread counter when displaying cached massage in preview panel

Browse Source 
- remove some empty lines in app.js
release-0.6
alecpl 16 years ago
parent f7028b2079
commit bf2f39ea6d
3 changed files with 26 additions and 118 deletions
Show Stats Download Patch File Download Diff File

1
CHANGELOG
Unescape Escape View File

@ -7,6 +7,7 @@ CHANGELOG RoundCube Webmail
long/non-ascii attachment names encoding eg. to be readable
in MS Outlook/OE (#1485320)
- Added "advanced options" feature in User Preferences
- Fix unread counter when displaying cached massage in preview panel (#1485290)
2008/09/25 (alec)
----------

134
program/js/app.js
Unescape Escape View File

@ -64,14 +64,12 @@ function rcube_webmail()
this.env[p] = value;
};
// add a localized label to the client environment
this.add_label = function(key, value)
{
this.labels[key] = value;
};
// add a button to the button list
this.register_button = function(command, id, type, act, sel, over)
{
@ -339,7 +337,6 @@ function rcube_webmail()
break;
}
// enable basic commands
this.enable_command('logout', true);
@ -353,7 +350,6 @@ function rcube_webmail()
// start keep-alive interval
this.start_keepalive();
// execute all foreign onload scripts
for (var i=0; i<this.onloads.length; i++)
{
@ -364,7 +360,6 @@ function rcube_webmail()
}
};
// start interval for keep-alive/recent_check signal
this.start_keepalive = function()
{
@ -374,7 +369,6 @@ function rcube_webmail()
this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
}
this.init_message_row = function(row)
{
var uid = row.uid;
@ -415,7 +409,6 @@ function rcube_webmail()
}
};
// init message compose form: set focus and eventhandlers
this.init_messageform = function()
{
@ -477,12 +470,10 @@ function rcube_webmail()
};
/*********************************************************/
/********* client command interface *********/
/*********************************************************/
// execute a specific command on the web client
this.command = function(command, props, obj)
{
@ -502,7 +493,6 @@ function rcube_webmail()
return false;
}
// check input before leaving compose step
if (this.task=='mail' && this.env.action=='compose' && (command=='list' || command=='mail' || command=='addressbook' || command=='settings'))
{
@ -1072,7 +1062,6 @@ function rcube_webmail()
return obj ? false : true;
};
// set command enabled or disabled
this.enable_command = function()
{
@ -1091,7 +1080,6 @@ function rcube_webmail()
return true;
};
// lock/unlock interface
this.set_busy = function(a, message)
{
@ -1121,7 +1109,6 @@ function rcube_webmail()
this.request_timer = window.setTimeout(function(){ ref.request_timed_out(); }, this.env.request_timeout * 1000);
};
// return a localized string
this.get_label = function(name)
{
@ -1131,7 +1118,6 @@ function rcube_webmail()
return name;
};
// switch to another application task
this.switch_task = function(task)
{
@ -1145,7 +1131,6 @@ function rcube_webmail()
this.redirect(url);
};
this.get_task_url = function(task, url)
{
if (!url)
@ -1154,7 +1139,6 @@ function rcube_webmail()
return url.replace(/_task=[a-z]+/, '_task='+task);
};
// called when a request timed out
this.request_timed_out = function()
{
@ -1167,7 +1151,6 @@ function rcube_webmail()
/********* event handling methods *********/
/*********************************************************/
this.doc_mouse_up = function(e)
{
var model, li;
@ -1264,7 +1247,6 @@ function rcube_webmail()
return rcube_event.get_button(e) == 2 ? true : rcube_event.cancel(e);
};
this.msglist_select = function(list)
{
if (this.preview_timer)
@ -1292,7 +1274,6 @@ function rcube_webmail()
this.show_contentframe(false);
};
this.msglist_dbl_click = function(list)
{
if (this.preview_timer)
@ -1305,7 +1286,6 @@ function rcube_webmail()
this.show_message(uid, false, false);
};
this.msglist_keypress = function(list)
{
if (list.key_pressed == list.ENTER_KEY)
@ -1318,7 +1298,6 @@ function rcube_webmail()
list.shiftkey = false;
};
this.msglist_get_preview = function()
{
var uid = this.get_single_uid();
@ -1328,7 +1307,6 @@ function rcube_webmail()
this.show_contentframe(false);
};
this.check_droptarget = function(id)
{
if (this.task == 'mail')
@ -1347,9 +1325,12 @@ function rcube_webmail()
// when user doble-clicks on a row
this.show_message = function(id, safe, preview)
{
if (!id) return;
var add_url = '';
var action = preview ? 'preview': 'show';
var target = window;
if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe])
{
target = window.frames[this.env.contentframe];
@ -1362,21 +1343,26 @@ function rcube_webmail()
// also send search request to get the right messages
if (this.env.search_request)
add_url += '&_search='+this.env.search_request;
if (id)
var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url;
if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
this.show_contentframe(true);
else
{
var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url;
if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
this.show_contentframe(true);
else
this.set_busy(true, 'loading');
target.location.href = this.env.comm_path+url;
// mark as read and change mbox unread counter
if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread)
{
this.set_busy(true, 'loading');
target.location.href = this.env.comm_path+url;
}
this.set_message(id, 'unread', false);
if (this.env.unread_counts[this.env.mailbox])
{
this.env.unread_counts[this.env.mailbox] -= 1;
this.set_unread_count(this.env.mailbox, this.env.unread_counts[this.env.mailbox], this.env.mailbox == 'INBOX');
}
}
}
};
this.show_contentframe = function(show)
{
var frm;
@ -1395,7 +1381,6 @@ function rcube_webmail()
this.set_busy(false);
};
// list a specific page
this.list_page = function(page)
{
@ -1419,7 +1404,6 @@ function rcube_webmail()
}
};
// list messages of a specific mailbox
this.list_mailbox = function(mbox, page, sort)
{
@ -1475,7 +1459,6 @@ function rcube_webmail()
}
};
// send remote request to load message list
this.list_mailbox_remote = function(mbox, page, add_url)
{
@ -1488,7 +1471,6 @@ function rcube_webmail()
this.http_request('list', url+add_url, true);
};
this.expunge_mailbox = function(mbox)
{
var lock = false;
@ -1507,7 +1489,6 @@ function rcube_webmail()
this.http_post('expunge', url+add_url, lock);
};
this.purge_mailbox = function(mbox)
{
var lock = false;
@ -1694,7 +1675,6 @@ function rcube_webmail()
this.permanently_remove_messages();
};
// delete the selected messages permanently
this.permanently_remove_messages = function()
{
@ -1744,7 +1724,6 @@ function rcube_webmail()
this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
};
// set a specific flag to one or more messages
this.mark_message = function(flag, uid)
{
@ -1858,7 +1837,6 @@ function rcube_webmail()
return true;
};
this.flag_as_undeleted = function(a_uids)
{
for (var i=0; i<a_uids.length; i++)
@ -1868,7 +1846,6 @@ function rcube_webmail()
return true;
};
this.flag_as_deleted = function(a_uids)
{
var add_url = '';
@ -1893,7 +1870,6 @@ function rcube_webmail()
return true;
};
// flag as read without mark request (called from backend)
// argument should be a coma-separated list of uids
this.flag_deleted_as_read = function(uids)
@ -1941,7 +1917,6 @@ function rcube_webmail()
/********* message compose methods *********/
/*********************************************************/
// checks the input fields before sending a message
this.check_compose_input = function()
{
@ -2007,7 +1982,6 @@ function rcube_webmail()
this.enable_command('spellcheck', this.spellcheck_ready);
};
this.set_draft_id = function(id)
{
var f;
@ -2024,7 +1998,6 @@ function rcube_webmail()
this.busy = false;
};
this.compose_field_hash = function(save)
{
// check input fields
@ -2058,7 +2031,6 @@ function rcube_webmail()
return str;
};
this.change_identity = function(obj)
{
if (!obj || !obj.options)
@ -2142,7 +2114,6 @@ function rcube_webmail()
return true;
};
this.show_attachment_form = function(a)
{
if (!this.gui_objects.uploadbox)
@ -2174,7 +2145,6 @@ function rcube_webmail()
return true;
};
// upload attachment file
this.upload_file = function(form)
{
@ -2225,7 +2195,6 @@ function rcube_webmail()
return true;
};
// add file name to attachment list
// called from upload page
this.add2attachment_list = function(name, content)
@ -2298,7 +2267,6 @@ function rcube_webmail()
return true;
};
this.sent_successfully = function(type, msg)
{
this.list_mailbox();
@ -2379,7 +2347,6 @@ function rcube_webmail()
return true;
};
this.insert_recipient = function(id)
{
if (!this.env.contacts[id] || !this.ksearch_input)
@ -2402,7 +2369,6 @@ function rcube_webmail()
this.ksearch_input.setSelectionRange(cpos, cpos);
};
// address search processor
this.ksearch_get_results = function()
{
@ -2503,7 +2469,6 @@ function rcube_webmail()
this.ksearch_hide();
};
this.ksearch_blur = function(e, obj)
{
if (this.ksearch_timer)
@ -2525,7 +2490,6 @@ function rcube_webmail()
};
/*********************************************************/
/********* address book methods *********/
/*********************************************************/
@ -2536,7 +2500,6 @@ function rcube_webmail()
this.command('delete');
};
this.contactlist_select = function(list)
{
if (this.preview_timer)
@ -2555,7 +2518,6 @@ function rcube_webmail()
return false;
};
this.list_contacts = function(src, page)
{
var add_url = '';
@ -2598,7 +2560,6 @@ function rcube_webmail()
target.location.href = this.env.comm_path+(src ? '&_source='+urlencode(src) : '')+(page ? '&_page='+page : '')+add_url;
};
// send remote request to load contacts list
this.list_contacts_remote = function(src, page)
{
@ -2619,7 +2580,6 @@ function rcube_webmail()
this.http_request('list', url, true);
};
// load contact record
this.load_contact = function(cid, action, framed)
{
@ -2644,13 +2604,13 @@ function rcube_webmail()
// copy a contact to the specified target (group or directory)
this.copy_contact = function(cid, to)
{
{
if (!cid)
cid = this.contact_list.get_selection().join(',');
if (to != this.env.source && cid && this.env.address_sources[to] && !this.env.address_sources[to].readonly)
this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to));
};
};
this.delete_contacts = function()
@ -2689,7 +2649,6 @@ function rcube_webmail()
return true;
};
// update a contact record in the list
this.update_contact_row = function(cid, cols_arr)
{
@ -2761,7 +2720,6 @@ function rcube_webmail()
return true;
};
this.delete_identity = function(id)
{
// exit if no mailbox specified or if selection is empty
@ -2777,7 +2735,6 @@ function rcube_webmail()
return true;
};
this.focus_subscription = function(id)
{
var row, folder;
@ -2803,7 +2760,6 @@ function rcube_webmail()
}
}
this.unfocus_subscription = function(id)
{
var row;
@ -2815,7 +2771,6 @@ function rcube_webmail()
this.set_classname(this.subscription_list.frame, 'droptarget', false);
}
this.subscription_select = function(list)
{
var id, folder;
@ -2830,7 +2785,6 @@ function rcube_webmail()
this.gui_objects.createfolderhint.innerHTML = this.env.folder ? this.get_label('addsubfolderhint') : '';
};
this.subscription_move_folder = function(list)
{
var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
@ -2846,7 +2800,6 @@ function rcube_webmail()
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)
{
@ -2874,7 +2827,6 @@ function rcube_webmail()
form.elements['_folder_name'].focus();
};
// start renaming the mailbox name.
// this will replace the name string with an input field
this.rename_folder = function(id)
@ -2909,7 +2861,6 @@ function rcube_webmail()
}
};
// remove the input field and write the current mailbox name to the table cell
this.reset_folder_rename = function()
{
@ -2921,7 +2872,6 @@ function rcube_webmail()
this.edit_folder = null;
};
// handler for keyboard events on the input field
this.name_input_keypress = function(e)
{
@ -2951,7 +2901,6 @@ function rcube_webmail()
this.reset_folder_rename();
};
// delete a specific mailbox with all its messages
this.delete_folder = function(id)
{
@ -2971,7 +2920,6 @@ function rcube_webmail()
}
};
// add a new folder to the subscription list by cloning a folder row
this.add_folder_row = function(name, display_name, replace, before)
{
@ -3047,7 +2995,6 @@ function rcube_webmail()
document.getElementById(id).scrollIntoView();
};
// replace an existing table row with a new folder line
this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
{
@ -3075,7 +3022,6 @@ function rcube_webmail()
}
};
// remove the table row of a specific mailbox from the table
// (the row will not be removed, just hidden)
this.remove_folder_row = function(folder)
@ -3103,21 +3049,18 @@ function rcube_webmail()
form.elements['_folder_newname'].value = '';
};
this.subscribe_folder = function(folder)
{
if (folder)
this.http_post('subscribe', '_mbox='+urlencode(folder));
};
this.unsubscribe_folder = function(folder)
{
if (folder)
this.http_post('unsubscribe', '_mbox='+urlencode(folder));
};
// helper method to find a specific mailbox row ID
this.get_folder_row_id = function(folder)
{
@ -3155,7 +3098,6 @@ function rcube_webmail()
/********* GUI functionality *********/
/*********************************************************/
// eable/disable buttons for page shifting
this.set_page_buttons = function()
{
@ -3165,7 +3107,6 @@ function rcube_webmail()
this.enable_command('firstpage', (this.env.current_page > 1));
}
// set button to a specific state
this.set_button = function(command, state)
{
@ -3298,7 +3239,6 @@ function rcube_webmail()
}
};
// set/unset a specific class name
this.set_classname = function(obj, classname, set)
{
@ -3309,7 +3249,6 @@ function rcube_webmail()
obj.className += ' '+classname;
};
// write to the document/window title
this.set_pagetitle = function(title)
{
@ -3317,7 +3256,6 @@ function rcube_webmail()
document.title = title;
}
// display a system message
this.display_message = function(msg, type, hold)
{
@ -3352,7 +3290,6 @@ function rcube_webmail()
this.message_timer = window.setTimeout(function(){ ref.hide_message(); }, this.message_time);
};
// make a message row disapear
this.hide_message = function()
{
@ -3363,7 +3300,6 @@ function rcube_webmail()
}
};
// mark a mailbox as selected and set environment variable
this.select_folder = function(name, old)
{
@ -3397,7 +3333,6 @@ function rcube_webmail()
return null;
};
// for reordering column array, Konqueror workaround
this.set_message_coltypes = function(coltypes)
{
@ -3511,7 +3446,6 @@ function rcube_webmail()
}
};
// replace content of row count display
this.set_rowcount = function(text)
{
@ -3522,7 +3456,6 @@ function rcube_webmail()
this.set_page_buttons();
};
// replace content of mailboxname display
this.set_mailboxname = function(content)
{
@ -3537,7 +3470,6 @@ function rcube_webmail()
this.gui_objects.quotadisplay.innerHTML = content;
};
// update the mailboxlist
this.set_unread_count = function(mbox, count, set_title)
{
@ -3548,7 +3480,6 @@ function rcube_webmail()
this.set_unread_count_display(mbox, set_title);
}
// update the mailbox count display
this.set_unread_count_display = function(mbox, set_title)
{
@ -3634,7 +3565,6 @@ function rcube_webmail()
this.enable_command('export', (this.contact_list.rowcount > 0));
};
this.toggle_editor = function(checkbox, textAreaId)
{
var ischecked = checkbox.checked;
@ -3656,7 +3586,6 @@ function rcube_webmail()
}
};
this.toggle_prefer_html = function(checkbox)
{
var addrbook_show_images;
@ -3664,7 +3593,6 @@ function rcube_webmail()
addrbook_show_images.disabled = !checkbox.checked;
}
// display fetched raw headers
this.set_headers = function(content)
{
@ -3681,7 +3609,6 @@ function rcube_webmail()
}
};
// display all-headers row and fetch raw message headers
this.load_headers = function(elem)
{
@ -3701,7 +3628,6 @@ function rcube_webmail()
}
}
// hide all-headers row
this.hide_headers = function(elem)
{
@ -3762,7 +3688,6 @@ function rcube_webmail()
this.redirect(this.env.comm_path+'&_action='+action+querystring, lock);
};
this.http_sockets = new Array();
// find a non-busy socket or create a new one
@ -3781,7 +3706,6 @@ function rcube_webmail()
return this.http_sockets[i];
};
// send a http request to the server
this.http_request = function(action, querystring, lock)
{
@ -3839,11 +3763,12 @@ function rcube_webmail()
this.http_response = function(request_obj)
{
var ctype = request_obj.get_header('Content-Type');
if (ctype){
if (ctype)
{
ctype = String(ctype).toLowerCase();
var ctype_array=ctype.split(";");
ctype = ctype_array[0];
}
}
if (request_obj.__lock)
this.set_busy(false);
@ -3895,17 +3820,15 @@ function rcube_webmail()
else if (this.task == 'addressbook')
this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
break;
}
}
request_obj.reset();
};
// handle HTTP request errors
this.http_error = function(request_obj)
{
//alert('Error sending request: '+request_obj.url+' => HTTP '+request_obj.xmlhttp.status);
if (request_obj.__lock)
this.set_busy(false);
@ -3914,7 +3837,6 @@ function rcube_webmail()
this.display_message('Unknown Server Error!', 'error');
};
// use an image to send a keep-alive siganl to the server
this.send_keep_alive = function()
{
@ -3922,7 +3844,6 @@ function rcube_webmail()
this.http_request('keep-alive', '_t='+d.getTime());
};
// send periodic request to check for recent messages
this.check_for_recent = function()
{
@ -3979,7 +3900,6 @@ function rcube_webmail()
return obj.value.length;
};
this.set_caret2start = function(obj)
{
if (obj.createTextRange)
@ -3994,7 +3914,6 @@ function rcube_webmail()
obj.focus();
};
// set all fields of a form disabled
this.lock_form = function(form, lock)
{
@ -4015,7 +3934,6 @@ function rcube_webmail()
} // end object rcube_webmail
/**
* Class for sending HTTP requests
* @constructor
@ -4026,7 +3944,6 @@ function rcube_http_request()
this.busy = false;
this.xmlhttp = null;
// reset object properties
this.reset = function()
{
@ -4043,7 +3960,6 @@ function rcube_http_request()
this.xmlhttp = null;
}
// create HTMLHTTP object
this.build = function()
{
@ -4081,7 +3997,6 @@ function rcube_http_request()
this.xmlhttp.send(null);
};
this.POST = function(url, body, contentType)
{
// default value for contentType if not provided
@ -4115,7 +4030,6 @@ function rcube_http_request()
this.xmlhttp.send(req_body);
};
// handle onreadystatechange event
this.xmlhttp_onreadystatechange = function()
{

9
program/steps/mail/show.inc
Unescape Escape View File

@ -67,14 +67,7 @@ if ($_GET['_uid']) {
// mark message as read
if (!$MESSAGE->headers->seen)
{
$marked = $IMAP->set_flag($MESSAGE->uid, 'SEEN');
if($RCMAIL->action == 'preview' && $marked != -1)
{
$OUTPUT->command('parent.set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'), ($mbox_name == 'INBOX'));
$OUTPUT->command('parent.set_message', $MESSAGE->uid, 'unread', false);
}
}
$IMAP->set_flag($MESSAGE->uid, 'SEEN');
// give message uid to the client
$OUTPUT->set_env('uid', $MESSAGE->uid);

Write Preview
Loading…
Cancel
Save