From a039c626eef6ad0e6c915d1618fbd0e6e40f57a2 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 04 Mar 2010 09:39:47 -0500
Subject: [PATCH] - Fix deleting all messages from last list page (#1486293)
---
program/js/app.js | 530 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 367 insertions(+), 163 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index e7c5289..f6cf04b 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -22,6 +22,7 @@
this.env = new Object();
this.labels = new Object();
this.buttons = new Object();
+ this.buttons_sel = new Object();
this.gui_objects = new Object();
this.gui_containers = new Object();
this.commands = new Object();
@@ -304,7 +305,7 @@
this.set_page_buttons();
if (this.env.address_sources && this.env.address_sources[this.env.source] && !this.env.address_sources[this.env.source].readonly)
- this.enable_command('add', true);
+ this.enable_command('add', 'import', true);
if (this.env.cid)
this.enable_command('show', 'edit', true);
@@ -312,7 +313,7 @@
if ((this.env.action=='add' || this.env.action=='edit') && this.gui_objects.editform)
this.enable_command('save', true);
else
- this.enable_command('search', 'reset-search', 'moveto', 'import', true);
+ this.enable_command('search', 'reset-search', 'moveto', true);
if (this.contact_list && this.contact_list.rowcount > 0)
this.enable_command('export', true);
@@ -326,11 +327,11 @@
if (this.env.action=='identities') {
this.enable_command('add', this.env.identities_level < 2);
- }
- else if (this.env.action=='edit-identity' || this.env.action=='add-identity') {
+ }
+ else if (this.env.action=='edit-identity' || this.env.action=='add-identity') {
this.enable_command('add', this.env.identities_level < 2);
this.enable_command('save', 'delete', 'edit', true);
- }
+ }
else if (this.env.action=='folders')
this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', true);
@@ -350,7 +351,8 @@
this.sections_list.addEventListener('select', function(o){ p.section_select(o); });
this.sections_list.init();
this.sections_list.focus();
- }
+ this.sections_list.select_first(); // open first section by default
+ }
else if (this.gui_objects.subscriptionlist)
this.init_subscription_list();
@@ -464,23 +466,29 @@
var input_to = $("[name='_to']");
var input_subject = $("input[name='_subject']");
var input_message = $("[name='_message']").get(0);
+ var html_mode = $("input[name='_is_html']").val() == '1';
// init live search events
this.init_address_input_events(input_to);
this.init_address_input_events($("[name='_cc']"));
this.init_address_input_events($("[name='_bcc']"));
+
+ if (!html_mode)
+ this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
// add signature according to selected identity
if (input_from.attr('type') == 'select-one' && $("input[name='_draft_saveid']").val() == ''
- && $("input[name='_is_html']").val() != '1') { // if we have HTML editor, signature is added in callback
+ && !html_mode) { // if we have HTML editor, signature is added in callback
this.change_identity(input_from[0]);
}
+ else if (!html_mode)
+ this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
if (input_to.val() == '')
input_to.focus();
else if (input_subject.val() == '')
input_subject.focus();
- else if (input_message)
+ else if (input_message && !html_mode)
input_message.focus();
// get summary of all field values
@@ -600,7 +608,7 @@
this.reset_qsearch();
this.list_contacts(props);
- this.enable_command('add', (this.env.address_sources && !this.env.address_sources[props].readonly));
+ this.enable_command('add', 'import', (this.env.address_sources && !this.env.address_sources[props].readonly));
}
break;
@@ -616,8 +624,8 @@
if (this.env.sort_col==sort_col)
sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
else
- sort_order = 'ASC';
-
+ sort_order = 'ASC';
+
// set table header class
$('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));
$('#rcm'+sort_col).addClass('sorted'+sort_order);
@@ -696,9 +704,9 @@
else if (this.task=='settings' && props)
this.load_identity(props, 'edit-identity');
else if (this.task=='mail' && (cid = this.get_single_uid())) {
- var url = (this.env.mailbox == this.env.drafts_mailbox) ? '_draft_uid=' : '_uid=';
+ var url = (this.env.mailbox == this.env.drafts_mailbox) ? '_draft_uid=' : '_uid=';
this.goto_url('compose', url+cid+'&_mbox='+urlencode(this.env.mailbox), true);
- }
+ }
break;
case 'save-identity':
@@ -836,7 +844,7 @@
case 'select-all':
if (props == 'invert')
this.message_list.invert_selection();
- else
+ else
this.message_list.select_all(props);
break;
@@ -983,6 +991,10 @@
this.remove_attachment(props);
break;
+ case 'insert-sig':
+ this.change_identity($("[name='_from']")[0], true);
+ break;
+
case 'reply-all':
case 'reply':
var uid;
@@ -1063,7 +1075,7 @@
this.lock_form(this.gui_objects.importform, true);
}
else
- this.goto_url('import');
+ this.goto_url('import', (this.env.source ? '_target='+urlencode(this.env.source)+'&' : ''));
break;
case 'export':
@@ -1213,6 +1225,16 @@
this.set_busy(false);
this.display_message('Request timed out!', 'error');
};
+
+ this.reload = function(delay)
+ {
+ if (this.env.framed && parent.rcmail)
+ parent.rcmail.reload(delay);
+ else if (delay)
+ window.setTimeout(function(){ rcmail.reload(); }, delay);
+ else if (window.location)
+ location.href = this.env.comm_path;
+ };
/*********************************************************/
@@ -1245,6 +1267,14 @@
this.command('moveto', model[this.env.last_folder_target].id);
this.env.last_folder_target = null;
list.draglayer.hide();
+ }
+
+ // reset 'pressed' buttons
+ if (this.buttons_sel) {
+ for (var id in this.buttons_sel)
+ if (typeof id != 'function')
+ this.button_out(this.buttons_sel[id], id);
+ this.buttons_sel = {};
}
};
@@ -1588,8 +1618,8 @@
this.env.current_page = 1;
this.set_busy(true, 'searching');
this.http_request('search', '_filter='+filter
- + (search ? '&_q='+urlencode(search) : '')
- + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), true);
+ + (search ? '&_q='+urlencode(search) : '')
+ + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), true);
}
@@ -1609,15 +1639,15 @@
// also send search request to get the right messages
if (this.env.search_request)
add_url += '&_search='+this.env.search_request;
-
+
// set page=1 if changeing to another mailbox
- if (!page)
+ if (!page && this.env.mailbox != mbox)
{
page = 1;
this.env.current_page = page;
this.show_contentframe(false);
}
-
+
if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
add_url += '&_refresh=1';
@@ -1855,7 +1885,7 @@
if (this.env.flag_for_deletion)
this.mark_message('delete');
// if there isn't a defined trash mailbox or we are in it
- else if (!this.env.trash_mailbox || String(this.env.mailbox).toLowerCase() == String(this.env.trash_mailbox).toLowerCase())
+ else if (!this.env.trash_mailbox || this.env.mailbox == this.env.trash_mailbox)
this.permanently_remove_messages();
// if there is a trash mailbox defined and we're not currently in it
else {
@@ -2151,6 +2181,14 @@
return false;
}
+ // check if all files has been uploaded
+ for (var key in this.env.attachments) {
+ if (typeof this.env.attachments[key] == 'object' && !this.env.attachments[key].complete) {
+ alert(this.get_label('notuploadedwarning'));
+ return false;
+ }
+ }
+
// display localized warning for missing subject
if (input_subject.val() == '')
{
@@ -2255,113 +2293,143 @@
str += editor.getContent();
else
str += $("[name='_message']").val();
-
+
+ if (this.env.attachments)
+ for (var upload_id in this.env.attachments)
+ str += upload_id;
+
if (save)
this.cmp_hash = str;
-
+
return str;
};
- this.change_identity = function(obj)
- {
+ this.change_identity = function(obj, show_sig)
+ {
if (!obj || !obj.options)
return false;
+
+ if (!show_sig)
+ show_sig = this.env.show_sig;
var id = obj.options[obj.selectedIndex].value;
var input_message = $("[name='_message']");
var message = input_message.val();
var is_html = ($("input[name='_is_html']").val() == '1');
- var sig, p, len;
+ var sig_separator = this.env.sig_above && (this.env.compose_mode == 'reply' || this.env.compose_mode == 'forward') ? '---' : '-- ';
+ var sig, cursor_pos, p = -1;
if (!this.env.identity)
this.env.identity = id
- if (!is_html)
- {
+ // enable manual signature insert
+ if (this.env.signatures && this.env.signatures[id])
+ this.enable_command('insert-sig', true);
+ else
+ this.enable_command('insert-sig', false);
+
+ if (!is_html) {
// remove the 'old' signature
- if (this.env.identity && this.env.signatures && this.env.signatures[this.env.identity])
- {
- if (this.env.signatures[this.env.identity]['is_html'])
- sig = this.env.signatures[this.env.identity]['plain_text'];
- else
- sig = this.env.signatures[this.env.identity]['text'];
+ if (show_sig && this.env.identity && this.env.signatures && this.env.signatures[this.env.identity]) {
+ sig = this.env.signatures[this.env.identity].is_html ? this.env.signatures[this.env.identity].plain_text : this.env.signatures[this.env.identity].text;
- if (sig.indexOf('-- ')!=0)
- sig = '-- \n'+sig;
+ if (sig.indexOf('-- ') != 0)
+ sig = sig_separator + '\n' + sig;
- p = message.lastIndexOf(sig);
- if (p>=0)
- message = message.substring(0, p-1) + message.substring(p+sig.length, message.length);
- }
-
- message = message.replace(/[\r\n]+$/, '');
- len = message.length;
+ p = this.env.sig_above ? message.indexOf(sig) : message.lastIndexOf(sig);
+ if (p >= 0)
+ message = message.substring(0, p) + message.substring(p+sig.length, message.length);
+ }
// add the new signature string
- if (this.env.signatures && this.env.signatures[id])
- {
- sig = this.env.signatures[id]['text'];
- if (this.env.signatures[id]['is_html'])
- {
- sig = this.env.signatures[id]['plain_text'];
+ if (show_sig && this.env.signatures && this.env.signatures[id]) {
+ sig = this.env.signatures[id]['is_html'] ? this.env.signatures[id]['plain_text'] : this.env.signatures[id]['text'];
+ if (sig.indexOf('-- ') != 0)
+ sig = sig_separator + '\n' + sig;
+
+ if (this.env.sig_above) {
+ if (p >= 0) { // in place of removed signature
+ message = message.substring(0, p) + sig + message.substring(p, message.length);
+ cursor_pos = p - 1;
+ }
+ else if (pos = this.get_caret_pos(input_message.get(0))) { // at cursor position
+ message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
+ cursor_pos = pos;
}
- if (sig.indexOf('-- ')!=0)
- sig = '-- \n'+sig;
- message += '\n\n'+sig;
- if (len) len += 1;
+ else { // on top
+ cursor_pos = 0;
+ message = '\n\n' + sig + '\n\n' + message.replace(/^[\r\n]+/, '');
+ }
+ }
+ else {
+ message = message.replace(/[\r\n]+$/, '');
+ cursor_pos = !this.env.top_posting && message.length ? message.length+1 : 0;
+ message += '\n\n' + sig;
}
}
- else
- {
+ else
+ cursor_pos = this.env.top_posting ? 0 : message.length;
+
+ input_message.val(message);
+
+ // move cursor before the signature
+ this.set_caret_pos(input_message.get(0), cursor_pos);
+ }
+ else if (is_html && show_sig && this.env.signatures) { // html
var editor = tinyMCE.get(this.env.composebody);
+ var sigElem = editor.dom.get('_rc_sig');
- if (this.env.signatures)
- {
- // Append the signature as a div within the body
- var sigElem = editor.dom.get('_rc_sig');
- var newsig = '';
- var htmlsig = true;
-
- if (!sigElem)
- {
- // add empty line before signature on IE
- if (bw.ie)
- editor.getBody().appendChild(editor.getDoc().createElement('br'));
-
- sigElem = editor.getDoc().createElement('div');
- sigElem.setAttribute('id', '_rc_sig');
- editor.getBody().appendChild(sigElem);
+ // Append the signature as a div within the body
+ if (!sigElem) {
+ var body = editor.getBody();
+ var doc = editor.getDoc();
+
+ sigElem = doc.createElement('div');
+ sigElem.setAttribute('id', '_rc_sig');
+
+ if (this.env.sig_above) {
+ // if no existing sig and top posting then insert at caret pos
+ editor.getWin().focus(); // correct focus in IE
+
+ var node = editor.selection.getNode();
+ if (node.nodeName == 'BODY') {
+ // no real focus, insert at start
+ body.insertBefore(sigElem, body.firstChild);
+ body.insertBefore(doc.createElement('br'), body.firstChild);
}
-
- if (this.env.signatures[id])
- {
- newsig = this.env.signatures[id]['text'];
- htmlsig = this.env.signatures[id]['is_html'];
-
- if (newsig) {
- if (htmlsig && this.env.signatures[id]['plain_text'].indexOf('-- ')!=0)
- newsig = '<p>-- </p>' + newsig;
- else if (!htmlsig && newsig.indexOf('-- ')!=0)
- newsig = '-- \n' + newsig;
+ else {
+ body.insertBefore(sigElem, node.nextSibling);
+ body.insertBefore(doc.createElement('br'), node.nextSibling);
}
}
+ else {
+ if (bw.ie) // add empty line before signature on IE
+ body.appendChild(doc.createElement('br'));
- if (htmlsig)
- sigElem.innerHTML = newsig;
- else
- sigElem.innerHTML = '<pre>' + newsig + '</pre>';
+ body.appendChild(sigElem);
}
}
- input_message.val(message);
+ if (this.env.signatures[id]) {
+ if (this.env.signatures[id].is_html) {
+ sig = this.env.signatures[id].text;
+ if (this.env.signatures[id].plain_text.indexOf('-- ') != 0)
+ sig = sig_separator + '<br />' + sig;
+ }
+ else {
+ sig = this.env.signatures[id].text;
+ if (sig.indexOf('-- ') != 0)
+ sig = sig_separator + '\n' + sig;
+ sig = '<pre>' + sig + '</pre>';
+ }
- // move cursor before the signature
- if (!is_html)
- this.set_caret_pos(input_message.get(0), len);
+ sigElem.innerHTML = sig;
+ }
+ }
this.env.identity = id;
return true;
- };
+ };
this.show_attachment_form = function(a)
{
@@ -2430,10 +2498,42 @@
document.body.appendChild(frame);
}
+ // handle upload errors, parsing iframe content in onload
+ var fr = document.getElementsByName(frame_name)[0];
+ $(fr).bind('load', {ts:ts}, function(e) {
+ var content = '';
+ try {
+ if (this.contentDocument) {
+ var d = this.contentDocument;
+ } else if (this.contentWindow) {
+ var d = this.contentWindow.document;
+ }
+ content = d.childNodes[0].innerHTML;
+ } catch (e) {}
+
+ if (!String(content).match(/add2attachment/) && (!bw.opera || (rcmail.env.uploadframe && rcmail.env.uploadframe == e.data.ts))) {
+ rcmail.display_message(rcmail.get_label('fileuploaderror'), 'error');
+ rcmail.remove_from_attachment_list(e.data.ts);
+ }
+ // Opera hack: handle double onload
+ if (bw.opera)
+ rcmail.env.uploadframe = e.data.ts;
+ });
+
form.target = frame_name;
- form.action = this.env.comm_path+'&_action=upload';
+ form.action = this.env.comm_path+'&_action=upload&_uploadid='+ts;
form.setAttribute('enctype', 'multipart/form-data');
form.submit();
+
+ // hide upload form
+ this.show_attachment_form(false);
+ // display upload indicator and cancel button
+ var content = this.get_label('uploading');
+ if (this.env.loadingicon)
+ content = '<img src="'+this.env.loadingicon+'" alt="" />'+content;
+ if (this.env.cancelicon)
+ content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload"><img src="'+this.env.cancelicon+'" alt="" /></a>'+content;
+ this.add2attachment_list(ts, { name:'', html:content, complete:false });
}
// set reference to the form object
@@ -2443,17 +2543,35 @@
// add file name to attachment list
// called from upload page
- this.add2attachment_list = function(name, content)
- {
+ this.add2attachment_list = function(name, att, upload_id)
+ {
if (!this.gui_objects.attachmentlist)
return false;
-
- $('<li>').attr('id', name).html(content).appendTo(this.gui_objects.attachmentlist);
+
+ var li = $('<li>').attr('id', name).html(att.html);
+ var indicator;
+
+ // replace indicator's li
+ if (upload_id && (indicator = document.getElementById(upload_id))) {
+ li.replaceAll(indicator);
+ }
+ else { // add new li
+ li.appendTo(this.gui_objects.attachmentlist);
+ }
+
+ if (upload_id && this.env.attachments[upload_id])
+ delete this.env.attachments[upload_id];
+
+ this.env.attachments[name] = att;
+
return true;
- };
+ };
this.remove_from_attachment_list = function(name)
- {
+ {
+ if (this.env.attachments[name])
+ delete this.env.attachments[name];
+
if (!this.gui_objects.attachmentlist)
return false;
@@ -2461,14 +2579,24 @@
for (i=0;i<list.length;i++)
if (list[i].id == name)
this.gui_objects.attachmentlist.removeChild(list[i]);
- };
+ };
this.remove_attachment = function(name)
{
- if (name)
+ if (name && this.env.attachments[name])
this.http_post('remove-attachment', '_file='+urlencode(name));
return true;
+ };
+
+ this.cancel_attachment_upload = function(name, frame_name)
+ {
+ if (!name || !frame_name)
+ return false;
+
+ this.remove_from_attachment_list(name);
+ $("iframe[name='"+frame_name+"']").remove();
+ return false;
};
// send remote request to add a new contact
@@ -2488,11 +2616,14 @@
var addurl = '';
if (this.message_list) {
this.message_list.clear();
- if (this.env.search_mods) {
- var head_arr = new Array();
- for (var n in this.env.search_mods)
- head_arr.push(n);
- addurl += '&_headers='+head_arr.join(',');
+ if (this.env.search_mods) {
+ var mods = this.env.search_mods[this.env.mailbox] ? this.env.search_mods[this.env.mailbox] : this.env.search_mods['*'];
+ if (mods) {
+ var head_arr = new Array();
+ for (var n in mods)
+ head_arr.push(n);
+ addurl += '&_headers='+head_arr.join(',');
+ }
}
} else if (this.contact_list) {
this.contact_list.clear(true);
@@ -2612,7 +2743,7 @@
return;
// get cursor pos
- var inp_value = this.ksearch_input.value.toLowerCase();
+ var inp_value = this.ksearch_input.value;
var cpos = this.get_caret_pos(this.ksearch_input);
var p = inp_value.lastIndexOf(this.ksearch_value, cpos);
@@ -2644,7 +2775,7 @@
var q = inp_value.substring(p+1, cpos);
// trim query string
- q = q.replace(/(^\s+|\s+$)/g, '').toLowerCase();
+ q = q.replace(/(^\s+|\s+$)/g, '');
// Don't (re-)search if the last results are still active
if (q == this.ksearch_value)
@@ -2679,8 +2810,8 @@
this.ksearch_display_results = function (a_results)
{
// display search results
- if (a_results.length && this.ksearch_input) {
- var p, ul, li;
+ if (a_results.length && this.ksearch_input && this.ksearch_value) {
+ var p, ul, li, s_val = this.ksearch_value;
// create results pane if not present
if (!this.ksearch_pane) {
@@ -2692,11 +2823,11 @@
// remove all search results
ul = this.ksearch_pane.__ul;
ul.innerHTML = '';
-
+
// add each result line to list
for (i=0; i<a_results.length; i++) {
li = document.createElement('LI');
- li.innerHTML = a_results[i].replace(new RegExp('('+this.ksearch_value+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
+ li.innerHTML = a_results[i].replace(new RegExp('('+s_val+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
li.onmouseover = function(){ ref.ksearch_select(this); };
li.onmouseup = function(){ ref.ksearch_click(this) };
li._rcm_id = i;
@@ -2906,7 +3037,7 @@
};
// update a contact record in the list
- this.update_contact_row = function(cid, cols_arr)
+ this.update_contact_row = function(cid, cols_arr, newcid)
{
var row;
if (this.contact_list.rows[cid] && (row = this.contact_list.rows[cid].obj)) {
@@ -2914,11 +3045,50 @@
if (row.cells[c])
$(row.cells[c]).html(cols_arr[c]);
+ // cid change
+ if (newcid) {
+ row.id = 'rcmrow' + newcid;
+ this.contact_list.remove_row(cid);
+ this.contact_list.init_row(row);
+ this.contact_list.selection[0] = newcid;
+ row.style.display = '';
+ }
+
return true;
}
return false;
};
+
+ // add row to contacts list
+ this.add_contact_row = function(cid, cols, select)
+ {
+ if (!this.gui_objects.contactslist || !this.gui_objects.contactslist.tBodies[0])
+ return false;
+
+ var tbody = this.gui_objects.contactslist.tBodies[0];
+ var rowcount = tbody.rows.length;
+ var even = rowcount%2;
+
+ var row = document.createElement('tr');
+ row.id = 'rcmrow'+cid;
+ row.className = 'contact '+(even ? 'even' : 'odd');
+
+ if (this.contact_list.in_selection(cid))
+ row.className += ' selected';
+
+ // add each submitted col
+ for (var c in cols) {
+ col = document.createElement('td');
+ col.className = String(c).toLowerCase();
+ col.innerHTML = cols[c];
+ row.appendChild(col);
+ }
+
+ this.contact_list.insert_row(row);
+
+ this.enable_command('export', (this.contact_list.rowcount > 0));
+ };
/*********************************************************/
@@ -2948,7 +3118,7 @@
// preferences section select and load options frame
this.section_select = function(list)
{
- var id = list.get_single_selection()
+ var id = list.get_single_selection();
if (id) {
var add_url = '';
@@ -2959,7 +3129,6 @@
add_url = '&_framed=1';
target = window.frames[this.env.contentframe];
}
-
target.location.href = this.env.comm_path+'&_action=edit-prefs&_section='+id+add_url;
}
@@ -2973,7 +3142,7 @@
this.load_identity(id, 'edit-identity');
};
- // load contact record
+ // load identity record
this.load_identity = function(id, action)
{
if (action=='edit-identity' && (!id || id==this.env.iid))
@@ -3203,10 +3372,13 @@
if (!this.gui_objects.subscriptionlist)
return false;
- // find not protected folder
- for (var refid in this.env.subscriptionrows)
- if (this.env.subscriptionrows[refid]!=null && !this.env.subscriptionrows[refid][2])
+ // find not protected folder
+ var refid;
+ for (var rid in this.env.subscriptionrows)
+ if (this.env.subscriptionrows[rid]!=null && !this.env.subscriptionrows[rid][2]) {
+ refid = rid;
break;
+ }
var refrow, form;
var tbody = this.gui_objects.subscriptionlist.tBodies[0];
@@ -3219,10 +3391,11 @@
refid = replace.id;
}
- if (!id || !(refrow = document.getElementById(refid)))
+ if (!id || !refid || !(refrow = document.getElementById(refid)))
{
// Refresh page if we don't have a table row to clone
this.goto_url('folders');
+ return false;
}
else
{
@@ -3248,7 +3421,7 @@
// set messages count to zero
if (!replace)
row.cells[1].innerHTML = '*';
-
+
if (!replace && row.cells[2] && row.cells[2].firstChild.tagName.toLowerCase()=='input')
{
row.cells[2].firstChild.value = name;
@@ -3535,6 +3708,7 @@
else
elm.className = button.sel;
}
+ this.buttons_sel[id] = command;
}
}
};
@@ -3782,8 +3956,12 @@
// replace content of quota display
this.set_quota = function(content)
{
- if (content && this.gui_objects.quotadisplay)
- $(this.gui_objects.quotadisplay).html(content);
+ if (content && this.gui_objects.quotadisplay) {
+ if (typeof(content) == 'object')
+ this.percent_indicator(this.gui_objects.quotadisplay, content);
+ else
+ $(this.gui_objects.quotadisplay).html(content);
+ }
};
// update the mailboxlist
@@ -3863,36 +4041,6 @@
window.focus();
}
- // add row to contacts list
- this.add_contact_row = function(cid, cols, select)
- {
- if (!this.gui_objects.contactslist || !this.gui_objects.contactslist.tBodies[0])
- return false;
-
- var tbody = this.gui_objects.contactslist.tBodies[0];
- var rowcount = tbody.rows.length;
- var even = rowcount%2;
-
- var row = document.createElement('tr');
- row.id = 'rcmrow'+cid;
- row.className = 'contact '+(even ? 'even' : 'odd');
-
- if (this.contact_list.in_selection(cid))
- row.className += ' selected';
-
- // add each submitted col
- for (var c in cols) {
- col = document.createElement('td');
- col.className = String(c).toLowerCase();
- col.innerHTML = cols[c];
- row.appendChild(col);
- }
-
- this.contact_list.insert_row(row);
-
- this.enable_command('export', (this.contact_list.rowcount > 0));
- };
-
this.toggle_prefer_html = function(checkbox)
{
var addrbook_show_images;
@@ -3942,6 +4090,61 @@
elem.onclick = function() { rcmail.load_headers(elem); }
}
+ // percent (quota) indicator
+ this.percent_indicator = function(obj, data)
+ {
+ if (!data || !obj)
+ return false;
+
+ var limit_high = 80;
+ var limit_mid = 55;
+ var width = data.width ? data.width : this.env.indicator_width ? this.env.indicator_width : 100;
+ var height = data.height ? data.height : this.env.indicator_height ? this.env.indicator_height : 14;
+ var quota = data.percent ? Math.abs(parseInt(data.percent)) : 0;
+ var quota_width = parseInt(quota / 100 * width);
+ var pos = $(obj).position();
+
+ this.env.indicator_width = width;
+ this.env.indicator_height = height;
+
+ // overlimit
+ if (quota_width > width) {
+ quota_width = width;
+ quota = 100;
+ }
+
+ // main div
+ var main = $('<div>');
+ main.css({position: 'absolute', top: pos.top, left: pos.left,
+ width: width + 'px', height: height + 'px', zIndex: 100, lineHeight: height + 'px'})
+ .attr('title', data.title).addClass('quota_text').html(quota + '%');
+ // used bar
+ var bar1 = $('<div>');
+ bar1.css({position: 'absolute', top: pos.top + 1, left: pos.left + 1,
+ width: quota_width + 'px', height: height + 'px', zIndex: 99});
+ // background
+ var bar2 = $('<div>');
+ bar2.css({position: 'absolute', top: pos.top + 1, left: pos.left + 1,
+ width: width + 'px', height: height + 'px', zIndex: 98})
+ .addClass('quota_bg');
+
+ if (quota >= limit_high) {
+ main.addClass(' quota_text_high');
+ bar1.addClass('quota_high');
+ }
+ else if(quota >= limit_mid) {
+ main.addClass(' quota_text_mid');
+ bar1.addClass('quota_mid');
+ }
+ else {
+ main.addClass(' quota_text_normal');
+ bar1.addClass('quota_low');
+ }
+
+ // replace quota image
+ obj.innerHTML = '';
+ $(obj).append(bar1).append(bar2).append(main);
+ }
/********************************************************/
/********* html to text conversion functions *********/
@@ -3980,7 +4183,7 @@
if (this.env.framed && window.parent)
parent.location.href = url;
- else
+ else
location.href = url;
};
@@ -3997,7 +4200,7 @@
var url = this.env.comm_path + '&_action=' + action + '&' + querystring
// send request
- console.log('HTTP POST: ' + url);
+ console.log('HTTP GET: ' + url);
jQuery.get(url, { _unlock:(lock?1:0) }, function(data){ ref.http_response(data); }, 'json');
};
@@ -4061,8 +4264,8 @@
case 'moveto':
if (this.env.action == 'show') {
- // re-enable commands on move/delete error
- this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'edit', 'viewsource', 'download', true);
+ // re-enable commands on move/delete error
+ this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'edit', 'viewsource', 'download', true);
} else if (this.message_list)
this.message_list.init();
break;
@@ -4075,8 +4278,8 @@
this.show_contentframe(false);
// disable commands useless when mailbox is empty
this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete',
- 'mark', 'viewsource', 'open', 'edit', 'download', 'print', 'load-attachment',
- 'purge', 'expunge', 'select-all', 'select-none', 'sort', false);
+ 'mark', 'viewsource', 'open', 'edit', 'download', 'print', 'load-attachment',
+ 'purge', 'expunge', 'select-all', 'select-none', 'sort', false);
}
break;
@@ -4122,15 +4325,17 @@
};
// send periodic request to check for recent messages
- this.check_for_recent = function(setbusy)
+ this.check_for_recent = function(refresh)
{
if (this.busy)
return;
- if (setbusy)
- this.set_busy(true, 'checkingmail');
-
var addurl = '_t=' + (new Date().getTime());
+
+ if (refresh) {
+ this.set_busy(true, 'checkingmail');
+ addurl += '&_refresh=1';
+ }
if (this.gui_objects.messagelist)
addurl += '&_list=1';
@@ -4224,4 +4429,3 @@
rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;
rcube_webmail.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener;
rcube_webmail.prototype.triggerEvent = rcube_event_engine.prototype.triggerEvent;
-
--
Gitblit v1.9.1