From a164a2e64b65fbe0729f6d4326b0219f1914c139 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 06 Oct 2008 05:32:09 -0400
Subject: [PATCH] - #1485463: fixed css classes setting in messages list
---
program/js/app.js | 186 +++++++++++++++------------------------------
1 files changed, 63 insertions(+), 123 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index d1341c7..bf6e8bc 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -64,13 +64,11 @@
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 @@
break;
}
-
// enable basic commands
this.enable_command('logout', true);
@@ -353,7 +350,6 @@
// 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 @@
}
};
-
// start interval for keep-alive/recent_check signal
this.start_keepalive = function()
{
@@ -373,7 +368,6 @@
else if (this.env.keep_alive && !this.env.framed && this.task!='login')
this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
}
-
this.init_message_row = function(row)
{
@@ -414,7 +408,6 @@
row.flagged_icon.onmousedown = function(e) { p.command('toggle_flag', this); };
}
};
-
// init message compose form: set focus and eventhandlers
this.init_messageform = function()
@@ -477,11 +470,9 @@
};
-
/*********************************************************/
/********* client command interface *********/
/*********************************************************/
-
// execute a specific command on the web client
this.command = function(command, props, obj)
@@ -501,7 +492,6 @@
return false;
}
-
// check input before leaving compose step
if (this.task=='mail' && this.env.action=='compose' && (command=='list' || command=='mail' || command=='addressbook' || command=='settings'))
@@ -831,22 +821,27 @@
case 'compose':
var url = this.env.comm_path+'&_action=compose';
- if (this.task=='mail' && this.env.mailbox==this.env.drafts_mailbox)
+ if (this.task=='mail')
{
- var uid;
- if (uid = this.get_single_uid())
- url += '&_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
- }
+ url += '&_mbox='+urlencode(this.env.mailbox);
+
+ if (this.env.mailbox==this.env.drafts_mailbox)
+ {
+ var uid;
+ if (uid = this.get_single_uid())
+ url += '&_draft_uid='+uid;
+ }
+ }
// modify url if we're in addressbook
else if (this.task=='addressbook')
{
// switch to mail compose step directly
if (props && props.indexOf('@') > 0)
- {
+ {
url = this.get_task_url('mail', url);
this.redirect(url + '&_to='+urlencode(props));
break;
- }
+ }
// use contact_id passed as command parameter
var a_cids = new Array();
@@ -1072,7 +1067,6 @@
return obj ? false : true;
};
-
// set command enabled or disabled
this.enable_command = function()
{
@@ -1090,7 +1084,6 @@
}
return true;
};
-
// lock/unlock interface
this.set_busy = function(a, message)
@@ -1121,7 +1114,6 @@
this.request_timer = window.setTimeout(function(){ ref.request_timed_out(); }, this.env.request_timeout * 1000);
};
-
// return a localized string
this.get_label = function(name)
{
@@ -1130,7 +1122,6 @@
else
return name;
};
-
// switch to another application task
this.switch_task = function(task)
@@ -1145,7 +1136,6 @@
this.redirect(url);
};
-
this.get_task_url = function(task, url)
{
if (!url)
@@ -1154,7 +1144,6 @@
return url.replace(/_task=[a-z]+/, '_task='+task);
};
-
// called when a request timed out
this.request_timed_out = function()
{
@@ -1166,7 +1155,6 @@
/*********************************************************/
/********* event handling methods *********/
/*********************************************************/
-
this.doc_mouse_up = function(e)
{
@@ -1264,7 +1252,6 @@
return rcube_event.get_button(e) == 2 ? true : rcube_event.cancel(e);
};
-
this.msglist_select = function(list)
{
if (this.preview_timer)
@@ -1292,7 +1279,6 @@
this.show_contentframe(false);
};
-
this.msglist_dbl_click = function(list)
{
if (this.preview_timer)
@@ -1304,7 +1290,6 @@
else if (uid)
this.show_message(uid, false, false);
};
-
this.msglist_keypress = function(list)
{
@@ -1318,7 +1303,6 @@
list.shiftkey = false;
};
-
this.msglist_get_preview = function()
{
var uid = this.get_single_uid();
@@ -1327,7 +1311,6 @@
else if (this.env.contentframe)
this.show_contentframe(false);
};
-
this.check_droptarget = function(id)
{
@@ -1347,9 +1330,12 @@
// 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,20 +1348,25 @@
// 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)
{
@@ -1394,7 +1385,6 @@
if (!show && this.busy)
this.set_busy(false);
};
-
// list a specific page
this.list_page = function(page)
@@ -1418,7 +1408,6 @@
this.list_contacts(this.env.source, page);
}
};
-
// list messages of a specific mailbox
this.list_mailbox = function(mbox, page, sort)
@@ -1475,7 +1464,6 @@
}
};
-
// send remote request to load message list
this.list_mailbox_remote = function(mbox, page, add_url)
{
@@ -1487,7 +1475,6 @@
this.set_busy(true, 'loading');
this.http_request('list', url+add_url, true);
};
-
this.expunge_mailbox = function(mbox)
{
@@ -1506,7 +1493,6 @@
var url = '_mbox='+urlencode(mbox);
this.http_post('expunge', url+add_url, lock);
};
-
this.purge_mailbox = function(mbox)
{
@@ -1694,7 +1680,6 @@
this.permanently_remove_messages();
};
-
// delete the selected messages permanently
this.permanently_remove_messages = function()
{
@@ -1743,7 +1728,6 @@
// send request to server
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 +1842,6 @@
return true;
};
-
this.flag_as_undeleted = function(a_uids)
{
for (var i=0; i<a_uids.length; i++)
@@ -1868,7 +1851,6 @@
return true;
};
-
this.flag_as_deleted = function(a_uids)
{
var add_url = '';
@@ -1892,7 +1874,6 @@
this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete'+add_url);
return true;
};
-
// flag as read without mark request (called from backend)
// argument should be a coma-separated list of uids
@@ -1941,7 +1922,6 @@
/********* message compose methods *********/
/*********************************************************/
-
// checks the input fields before sending a message
this.check_compose_input = function()
{
@@ -1949,8 +1929,17 @@
var input_to = rcube_find_object('_to');
var input_cc = rcube_find_object('_cc');
var input_bcc = rcube_find_object('_bcc');
+ var input_from = rcube_find_object('_from');
var input_subject = rcube_find_object('_subject');
var input_message = rcube_find_object('_message');
+
+ // check sender (if have no identities)
+ if (input_from.type == 'text' && !rcube_check_email(input_from.value, true))
+ {
+ alert(this.get_label('nosenderwarning'));
+ input_from.focus();
+ return false;
+ }
// check for empty recipient
var recipients = input_to.value ? input_to.value : (input_cc.value ? input_cc.value : input_bcc.value);
@@ -1996,6 +1985,13 @@
this.display_spellcheck_controls = function(vis)
{
if (this.env.spellcheck) {
+ // stop spellchecking process
+ if (!vis && !this.spellcheck_ready)
+ {
+ exec_event(this.env.spellcheck.check_link, 'click');
+ this.set_spellcheck_state('ready');
+ }
+
this.env.spellcheck.check_link.style.visibility = vis ? 'visible' : 'hidden';
this.env.spellcheck.switch_lan_pic.style.visibility = vis ? 'visible' : 'hidden';
}
@@ -2006,7 +2002,6 @@
this.spellcheck_ready = (s=='check_spelling' || s=='ready');
this.enable_command('spellcheck', this.spellcheck_ready);
};
-
this.set_draft_id = function(id)
{
@@ -2023,7 +2018,6 @@
// Unlock interface now that saving is complete
this.busy = false;
};
-
this.compose_field_hash = function(save)
{
@@ -2058,7 +2052,6 @@
return str;
};
-
this.change_identity = function(obj)
{
if (!obj || !obj.options)
@@ -2142,7 +2135,6 @@
return true;
};
-
this.show_attachment_form = function(a)
{
if (!this.gui_objects.uploadbox)
@@ -2173,7 +2165,6 @@
return true;
};
-
// upload attachment file
this.upload_file = function(form)
@@ -2224,7 +2215,6 @@
this.gui_objects.attachmentform = form;
return true;
};
-
// add file name to attachment list
// called from upload page
@@ -2297,7 +2287,6 @@
this.env.search_request = null;
return true;
};
-
this.sent_successfully = function(type, msg)
{
@@ -2379,7 +2368,6 @@
return true;
};
-
this.insert_recipient = function(id)
{
if (!this.env.contacts[id] || !this.ksearch_input)
@@ -2401,7 +2389,6 @@
if (this.ksearch_input.setSelectionRange)
this.ksearch_input.setSelectionRange(cpos, cpos);
};
-
// address search processor
this.ksearch_get_results = function()
@@ -2503,7 +2490,6 @@
this.ksearch_hide();
};
-
this.ksearch_blur = function(e, obj)
{
if (this.ksearch_timer)
@@ -2525,7 +2511,6 @@
};
-
/*********************************************************/
/********* address book methods *********/
/*********************************************************/
@@ -2535,7 +2520,6 @@
if (list.key_pressed == list.DELETE_KEY)
this.command('delete');
};
-
this.contactlist_select = function(list)
{
@@ -2554,7 +2538,6 @@
return false;
};
-
this.list_contacts = function(src, page)
{
@@ -2598,7 +2581,6 @@
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)
{
@@ -2618,7 +2600,6 @@
this.set_busy(true, 'loading');
this.http_request('list', url, true);
};
-
// load contact record
this.load_contact = function(cid, action, framed)
@@ -2644,13 +2625,13 @@
// 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()
@@ -2688,7 +2669,6 @@
this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_from='+(this.env.action ? this.env.action : '')+qs);
return true;
};
-
// update a contact record in the list
this.update_contact_row = function(cid, cols_arr)
@@ -2761,7 +2741,6 @@
return true;
};
-
this.delete_identity = function(id)
{
// exit if no mailbox specified or if selection is empty
@@ -2776,7 +2755,6 @@
this.goto_url('delete-identity', '_iid='+id, true);
return true;
};
-
this.focus_subscription = function(id)
{
@@ -2803,7 +2781,6 @@
}
}
-
this.unfocus_subscription = function(id)
{
var row;
@@ -2814,7 +2791,6 @@
else
this.set_classname(this.subscription_list.frame, 'droptarget', false);
}
-
this.subscription_select = function(list)
{
@@ -2830,7 +2806,6 @@
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)+']+$');
@@ -2845,7 +2820,6 @@
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)
@@ -2873,7 +2847,6 @@
else if (form.elements['_folder_name'])
form.elements['_folder_name'].focus();
};
-
// start renaming the mailbox name.
// this will replace the name string with an input field
@@ -2909,7 +2882,6 @@
}
};
-
// remove the input field and write the current mailbox name to the table cell
this.reset_folder_rename = function()
{
@@ -2920,7 +2892,6 @@
this.edit_folder = null;
};
-
// handler for keyboard events on the input field
this.name_input_keypress = function(e)
@@ -2951,7 +2922,6 @@
this.reset_folder_rename();
};
-
// delete a specific mailbox with all its messages
this.delete_folder = function(id)
{
@@ -2970,7 +2940,6 @@
this.gui_objects.createfolderhint.innerHTML = '';
}
};
-
// 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 +3016,6 @@
document.getElementById(id).scrollIntoView();
};
-
// replace an existing table row with a new folder line
this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
{
@@ -3074,7 +3042,6 @@
form.elements['_folder_newname'].value = '';
}
};
-
// remove the table row of a specific mailbox from the table
// (the row will not be removed, just hidden)
@@ -3103,13 +3070,11 @@
form.elements['_folder_newname'].value = '';
};
-
this.subscribe_folder = function(folder)
{
if (folder)
this.http_post('subscribe', '_mbox='+urlencode(folder));
};
-
this.unsubscribe_folder = function(folder)
{
@@ -3117,7 +3082,6 @@
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 +3119,6 @@
/********* GUI functionality *********/
/*********************************************************/
-
// eable/disable buttons for page shifting
this.set_page_buttons = function()
{
@@ -3164,7 +3127,6 @@
this.enable_command('previouspage', (this.env.current_page > 1));
this.enable_command('firstpage', (this.env.current_page > 1));
}
-
// set button to a specific state
this.set_button = function(command, state)
@@ -3298,7 +3260,6 @@
}
};
-
// set/unset a specific class name
this.set_classname = function(obj, classname, set)
{
@@ -3309,14 +3270,12 @@
obj.className += ' '+classname;
};
-
// 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)
@@ -3352,7 +3311,6 @@
this.message_timer = window.setTimeout(function(){ ref.hide_message(); }, this.message_time);
};
-
// make a message row disapear
this.hide_message = function()
{
@@ -3362,7 +3320,6 @@
this.gui_objects.message.onmousedown = null;
}
};
-
// mark a mailbox as selected and set environment variable
this.select_folder = function(name, old)
@@ -3396,7 +3353,6 @@
return null;
};
-
// for reordering column array, Konqueror workaround
this.set_message_coltypes = function(coltypes)
@@ -3450,7 +3406,11 @@
var row = document.createElement('TR');
row.id = 'rcmrow'+uid;
- row.className = 'message '+(even ? 'even' : 'odd')+(flags.unread ? ' unread' : '')+(flags.deleted ? ' deleted' : '');
+ row.className = 'message'
+ + (even ? ' even' : ' odd')
+ + (flags.unread ? ' unread' : '')
+ + (flags.deleted ? ' deleted' : '')
+ + (flags.flagged ? ' flagged' : '');
if (this.message_list.in_selection(uid))
row.className += ' selected';
@@ -3511,7 +3471,6 @@
}
};
-
// replace content of row count display
this.set_rowcount = function(text)
{
@@ -3521,7 +3480,6 @@
// update page navigation buttons
this.set_page_buttons();
};
-
// replace content of mailboxname display
this.set_mailboxname = function(content)
@@ -3537,7 +3495,6 @@
this.gui_objects.quotadisplay.innerHTML = content;
};
-
// update the mailboxlist
this.set_unread_count = function(mbox, count, set_title)
{
@@ -3548,14 +3505,13 @@
this.set_unread_count_display(mbox, set_title);
}
-
// update the mailbox count display
this.set_unread_count_display = function(mbox, set_title)
{
var reg, text_obj, item, mycount, childcount, div;
if (item = this.get_folder_li(mbox))
{
- mycount = this.env.unread_counts[mbox];
+ mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
text_obj = item.getElementsByTagName('a')[0];
reg = /\s+\([0-9]+\)$/i;
@@ -3564,10 +3520,10 @@
div.className.match(/collapsed/))
{
// add children's counters
- for (var k in this.env.unread_counts)
+ for (var k in this.env.unread_counts)
if (k.indexOf(mbox + this.env.delimiter) == 0) {
childcount += this.env.unread_counts[k];
- }
+ }
}
if (mycount && text_obj.innerHTML.match(reg))
@@ -3578,7 +3534,7 @@
text_obj.innerHTML = text_obj.innerHTML.replace(reg, '');
// set parent's display
- reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+');
+ reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+$');
if (mbox.match(reg))
this.set_unread_count_display(mbox.replace(reg, ''), false);
@@ -3634,7 +3590,6 @@
this.enable_command('export', (this.contact_list.rowcount > 0));
};
-
this.toggle_editor = function(checkbox, textAreaId)
{
var ischecked = checkbox.checked;
@@ -3656,14 +3611,12 @@
}
};
-
this.toggle_prefer_html = function(checkbox)
{
var addrbook_show_images;
if (addrbook_show_images = document.getElementById('rcmfd_addrbook_show_images'))
addrbook_show_images.disabled = !checkbox.checked;
}
-
// display fetched raw headers
this.set_headers = function(content)
@@ -3680,7 +3633,6 @@
this.set_busy(false);
}
};
-
// display all-headers row and fetch raw message headers
this.load_headers = function(elem)
@@ -3700,7 +3652,6 @@
this.http_post('headers', '_uid='+this.env.uid);
}
}
-
// hide all-headers row
this.hide_headers = function(elem)
@@ -3762,7 +3713,6 @@
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 +3731,6 @@
return this.http_sockets[i];
};
-
// send a http request to the server
this.http_request = function(action, querystring, lock)
{
@@ -3839,11 +3788,12 @@
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);
@@ -3887,25 +3837,24 @@
case 'getunread':
case 'list':
if (this.task == 'mail') {
- if (this.message_list)
+ if (this.message_list && request_obj.__action == 'list')
this.msglist_select(this.message_list);
this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
this.enable_command('purge', this.purge_mailbox_test());
}
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 +3863,6 @@
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 +3870,6 @@
this.http_request('keep-alive', '_t='+d.getTime());
};
-
// send periodic request to check for recent messages
this.check_for_recent = function()
{
@@ -3979,7 +3926,6 @@
return obj.value.length;
};
-
this.set_caret2start = function(obj)
{
if (obj.createTextRange)
@@ -3993,7 +3939,6 @@
obj.focus();
};
-
// set all fields of a form disabled
this.lock_form = function(form, lock)
@@ -4015,7 +3960,6 @@
} // end object rcube_webmail
-
/**
* Class for sending HTTP requests
* @constructor
@@ -4025,7 +3969,6 @@
this.url = '';
this.busy = false;
this.xmlhttp = null;
-
// reset object properties
this.reset = function()
@@ -4042,7 +3985,6 @@
this.busy = false;
this.xmlhttp = null;
}
-
// create HTMLHTTP object
this.build = function()
@@ -4081,7 +4023,6 @@
this.xmlhttp.send(null);
};
-
this.POST = function(url, body, contentType)
{
// default value for contentType if not provided
@@ -4114,7 +4055,6 @@
this.xmlhttp.setRequestHeader('X-RoundCube-Referer', bw.get_cookie('roundcube_sessid'));
this.xmlhttp.send(req_body);
};
-
// handle onreadystatechange event
this.xmlhttp_onreadystatechange = function()
--
Gitblit v1.9.1