From 9d2a3a819a588f0fad2aaac0b330bafe594954ec Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 29 Sep 2010 04:11:51 -0400
Subject: [PATCH] Focus search box or first edit field on page load
---
program/js/app.js | 453 +++++++++++++++++++++++++++++---------------------------
1 files changed, 234 insertions(+), 219 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 8cf81f8..64cc7c6 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1,9 +1,9 @@
/*
+-----------------------------------------------------------------------+
- | RoundCube Webmail Client Script |
+ | Roundcube Webmail Client Script |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2010, RoundCube Dev, - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2010, Roundcube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
@@ -56,7 +56,7 @@
$.ajaxSetup({
cache:false,
error:function(request, status, err){ ref.http_error(request, status, err); },
- beforeSend:function(xmlhttp){ xmlhttp.setRequestHeader('X-RoundCube-Request', ref.env.request_token); }
+ beforeSend:function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
});
// set environment variable(s)
@@ -225,7 +225,7 @@
}
}
else if (this.env.action == 'compose') {
- this.enable_command('add-attachment', 'send-attachment', 'remove-attachment', 'send', true);
+ this.enable_command('send-attachment', 'remove-attachment', 'send', 'toggle-editor', true);
if (this.env.spellcheck) {
this.env.spellcheck.spelling_state_observer = function(s){ ref.set_spellcheck_state(s); };
@@ -301,10 +301,14 @@
if (this.env.cid)
this.enable_command('show', 'edit', true);
- if ((this.env.action=='add' || this.env.action=='edit') && this.gui_objects.editform)
+ if ((this.env.action=='add' || this.env.action=='edit') && this.gui_objects.editform) {
this.enable_command('save', true);
- else
+ $("input[type='text']").first().select();
+ }
+ else if (this.gui_objects.qsearchbox) {
this.enable_command('search', 'reset-search', 'moveto', true);
+ $(this.gui_objects.qsearchbox).select();
+ }
if (this.contact_list && this.contact_list.rowcount > 0)
this.enable_command('export', true);
@@ -321,7 +325,7 @@
}
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);
+ this.enable_command('save', 'delete', 'edit', 'toggle-editor', true);
}
else if (this.env.action=='folders')
this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', 'enable-threading', 'disable-threading', true);
@@ -484,10 +488,9 @@
}
break;
- // misc list commands
case 'list':
if (this.task=='mail') {
- if (this.env.search_request<0 || (props != '' && (this.env.search_request && props != this.env.mailbox)))
+ if (!this.env.search_request || (props && props != this.env.mailbox))
this.reset_qsearch();
this.list_mailbox(props);
@@ -496,7 +499,7 @@
this.set_alttext('delete', this.env.mailbox != this.env.trash_mailbox ? 'movemessagetotrash' : 'deletemessage');
}
else if (this.task=='addressbook') {
- if (this.env.search_request<0 || (this.env.search_request && props != this.env.source))
+ if (!this.env.search_request || (props != this.env.source))
this.reset_qsearch();
this.list_contacts(props);
@@ -504,16 +507,9 @@
}
break;
-
- case 'listgroup':
- this.list_contacts(props.source, props.id);
- break;
-
-
case 'load-headers':
this.load_headers(obj);
break;
-
case 'sort':
var sort_order, sort_col = props;
@@ -557,7 +553,6 @@
this.purge_mailbox(this.env.mailbox);
break;
-
// common commands used in multiple tasks
case 'show':
if (this.task=='mail') {
@@ -597,7 +592,6 @@
}
break;
- case 'save-identity':
case 'save':
if (this.gui_objects.editform) {
var input_pagesize = $("input[name='_pagesize']");
@@ -725,10 +719,12 @@
case 'select-all':
this.select_all_mode = props ? false : true;
+ this.dummy_select = true; // prevent msg opening if there's only one msg on the list
if (props == 'invert')
this.message_list.invert_selection();
else
this.message_list.select_all(props == 'page' ? '' : props);
+ this.dummy_select = null;
break;
case 'select-none':
@@ -872,18 +868,11 @@
clearTimeout(this.request_timer);
break;
- case 'add-attachment':
- this.show_attachment_form(true);
-
case 'send-attachment':
// Reset the auto-save timer
self.clearTimeout(this.save_timer);
this.upload_file(props)
- break;
-
- case 'remove-attachment':
- this.remove_attachment(props);
break;
case 'insert-sig':
@@ -930,10 +919,6 @@
this.goto_url('viewsource', '&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+'&_save=1');
break;
- case 'add-contact':
- this.add_contact(props);
- break;
-
// quicksearch
case 'search':
if (!props && this.gui_objects.qsearchbox)
@@ -954,16 +939,8 @@
this.list_contacts(this.env.source, this.env.group);
break;
- case 'group-create':
- this.add_contact_group(props)
- break;
-
- case 'group-rename':
- this.rename_contact_group();
- break;
-
- case 'group-delete':
- this.delete_contact_group();
+ case 'listgroup':
+ this.list_contacts(props.source, props.id);
break;
case 'import':
@@ -991,12 +968,6 @@
}
break;
- // collapse/expand folder
- case 'collapse-folder':
- if (props)
- this.collapse_folder(props);
- break;
-
// user settings commands
case 'preferences':
this.goto_url('');
@@ -1006,41 +977,16 @@
this.goto_url('identities');
break;
- case 'delete-identity':
- this.delete_identity();
-
case 'folders':
this.goto_url('folders');
break;
- case 'subscribe':
- this.subscribe_folder(props);
+ // unified command call (command name == function name)
+ default:
+ var func = command.replace(/-/g, '_');
+ if (this[func] && typeof this[func] == 'function')
+ this[func](props);
break;
-
- case 'unsubscribe':
- this.unsubscribe_folder(props);
- break;
-
- case 'enable-threading':
- this.enable_threading(props);
- break;
-
- case 'disable-threading':
- this.disable_threading(props);
- break;
-
- case 'create-folder':
- this.create_folder(props);
- break;
-
- case 'rename-folder':
- this.rename_folder(props);
- break;
-
- case 'delete-folder':
- this.delete_folder(props);
- break;
-
}
this.triggerEvent('after'+command, props);
@@ -1078,10 +1024,13 @@
if (msg == message)
msg = 'Loading...';
- this.display_message(msg, 'loading', true);
+ // @TODO: show many messages at a time (one below the other ?)
+ if (this.message_type() != 'error')
+ this.display_message(msg, 'loading', true);
}
- else if (!a)
+ else if (!a && this.message_type() != 'error') {
this.hide_message();
+ }
this.busy = a;
//document.body.style.cursor = a ? 'wait' : 'default';
@@ -1302,7 +1251,7 @@
this.env.folder_coords[k].on = 0;
}
}
-
+
if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
this.contact_list.draglayer.attr('class', layerclass);
}
@@ -1343,7 +1292,7 @@
}
}
- this.http_post('save-pref', '_name=collapsed_folders&_value='+urlencode(this.env.collapsed_folders));
+ this.http_post('utils/save-pref', '_name=collapsed_folders&_value='+urlencode(this.env.collapsed_folders));
this.set_unread_count_display(id, false);
};
@@ -1427,7 +1376,7 @@
this.select_all_mode = false;
// start timer for message preview (wait for double click)
- if (selected && this.env.contentframe && !list.multi_selecting)
+ if (selected && this.env.contentframe && !list.multi_selecting && !this.dummy_select)
this.preview_timer = window.setTimeout(function(){ ref.msglist_get_preview(); }, 200);
else if (this.env.contentframe)
this.show_contentframe(false);
@@ -1495,13 +1444,13 @@
if (this.env.messages[row.uid])
this.env.messages[row.uid].expanded = row.expanded;
};
-
+
this.msglist_set_coltypes = function(list)
{
var i, found, name, cols = list.list.tHead.rows[0].cells;
-
+
this.env.coltypes = [];
-
+
for (i=0; i<cols.length; i++)
if (cols[i].id && cols[i].id.match(/^rcm/)) {
name = cols[i].id.replace(/^rcm/, '');
@@ -1514,13 +1463,13 @@
if ((found = $.inArray('subject', this.env.coltypes)) >= 0)
this.set_env('subject_col', found);
- this.http_post('save-pref', { '_name':'list_cols', '_value':this.env.coltypes });
+ this.http_post('utils/save-pref', { '_name':'list_cols', '_value':this.env.coltypes, '_session':'list_attrib/columns' });
};
this.check_droptarget = function(id)
{
var allow = false, copy = false;
-
+
if (this.task == 'mail')
allow = (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
else if (this.task == 'settings')
@@ -1731,7 +1680,7 @@
{
var update, add_url = '';
- if (sort_col === null)
+ if (typeof sort_col == 'undefined')
sort_col = this.env.sort_col;
if (!sort_order)
sort_order = this.env.sort_order;
@@ -1818,11 +1767,11 @@
this.show_contentframe = function(show)
{
- var frm;
+ var frm, win;
if (this.env.contentframe && (frm = $('#'+this.env.contentframe)) && frm.length) {
- if (!show && window.frames[this.env.contentframe]) {
- if (window.frames[this.env.contentframe].location.href.indexOf(this.env.blankpage)<0)
- window.frames[this.env.contentframe].location.href = this.env.blankpage;
+ if (!show && (win = window.frames[this.env.contentframe])) {
+ if (win.location && win.location.href.indexOf(this.env.blankpage)<0)
+ win.location.href = this.env.blankpage;
}
else if (!bw.safari && !bw.konq)
frm[show ? 'show' : 'hide']();
@@ -1837,11 +1786,11 @@
{
if (page == 'next')
page = this.env.current_page+1;
- if (page == 'last')
+ else if (page == 'last')
page = this.env.pagecount;
- if (page == 'prev' && this.env.current_page > 1)
+ else if (page == 'prev' && this.env.current_page > 1)
page = this.env.current_page-1;
- if (page == 'first' && this.env.current_page > 1)
+ else if (page == 'first' && this.env.current_page > 1)
page = 1;
if (page > 0 && page <= this.env.pagecount) {
@@ -1850,7 +1799,7 @@
if (this.task == 'mail')
this.list_mailbox(this.env.mailbox, page);
else if (this.task == 'addressbook')
- this.list_contacts(this.env.source, null, page);
+ this.list_contacts(this.env.source, this.env.group, page);
}
};
@@ -1895,17 +1844,14 @@
page = 1;
this.env.current_page = page;
this.select_all_mode = false;
- this.show_contentframe(false);
}
+
+ // unselect selected messages and clear the list and message data
+ this.clear_message_list();
if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
url += '&_refresh=1';
- // unselect selected messages
- this.last_selected = 0;
- if (this.message_list) {
- this.message_list.clear_selection();
- }
this.select_folder(mbox, this.env.mailbox);
this.env.mailbox = mbox;
@@ -1925,6 +1871,16 @@
this.set_busy(true, 'loading');
target.location.href = this.env.comm_path+'&_mbox='+urlencode(mbox)+(page ? '&_page='+page : '')+url;
}
+ };
+
+ this.clear_message_list = function()
+ {
+ this.env.messages = {};
+ this.last_selected = 0;
+
+ this.show_contentframe(false);
+ if (this.message_list)
+ this.message_list.clear(true);
};
// send remote request to load message list
@@ -2260,8 +2216,6 @@
rows[uid].forwarded = status;
else if (flag == 'flagged')
rows[uid].flagged = status;
-
-// this.env.messages[uid] = rows[uid];
};
// set message row status, class and icon
@@ -2802,12 +2756,12 @@
this.check_compose_input = function()
{
// check input fields
- var input_to = $("[name='_to']");
- var input_cc = $("[name='_cc']");
- var input_bcc = $("[name='_bcc']");
- var input_from = $("[name='_from']");
- var input_subject = $("[name='_subject']");
- var input_message = $("[name='_message']");
+ var ed, input_to = $("[name='_to']"),
+ input_cc = $("[name='_cc']"),
+ input_bcc = $("[name='_bcc']"),
+ input_from = $("[name='_from']"),
+ input_subject = $("[name='_subject']"),
+ input_message = $("[name='_message']");
// check sender (if have no identities)
if (input_from.attr('type') == 'text' && !rcube_check_email(input_from.val(), true)) {
@@ -2845,33 +2799,63 @@
input_subject.val((subject ? subject : this.get_label('nosubject')));
}
- // check for empty body
- if ((!window.tinyMCE || !tinyMCE.get(this.env.composebody))
- && input_message.val() == '' && !confirm(this.get_label('nobodywarning'))) {
- input_message.focus();
- return false;
- }
- else if (window.tinyMCE && tinyMCE.get(this.env.composebody)
- && !tinyMCE.get(this.env.composebody).getContent()
- && !confirm(this.get_label('nobodywarning'))) {
- tinyMCE.get(this.env.composebody).focus();
- return false;
- }
-
// Apply spellcheck changes if spell checker is active
this.stop_spellchecking();
- // move body from html editor to textarea (just to be sure, #1485860)
- if (window.tinyMCE && tinyMCE.get(this.env.composebody))
+ if (window.tinyMCE)
+ ed = tinyMCE.get(this.env.composebody);
+
+ // check for empty body
+ if (!ed && input_message.val() == '' && !confirm(this.get_label('nobodywarning'))) {
+ input_message.focus();
+ return false;
+ }
+ else if (ed) {
+ if (!ed.getContent() && !confirm(this.get_label('nobodywarning'))) {
+ ed.focus();
+ return false;
+ }
+ // move body from html editor to textarea (just to be sure, #1485860)
tinyMCE.triggerSave();
+ }
+
+ return true;
+ };
+
+ this.toggle_editor = function(props)
+ {
+ if (props.mode == 'html') {
+ this.display_spellcheck_controls(false);
+ this.plain2html($('#'+props.id).val(), props.id);
+ tinyMCE.execCommand('mceAddControl', false, props.id);
+ }
+ else {
+ var thisMCE = tinyMCE.get(props.id), existingHtml;
+ if (thisMCE.plugins.spellchecker && thisMCE.plugins.spellchecker.active)
+ thisMCE.execCommand('mceSpellCheck', false);
+
+ if (existingHtml = thisMCE.getContent()) {
+ if (!confirm(this.get_label('editorwarning'))) {
+ return false;
+ }
+ this.html2plain(existingHtml, props.id);
+ }
+ tinyMCE.execCommand('mceRemoveControl', false, props.id);
+ this.display_spellcheck_controls(true);
+ }
return true;
};
this.stop_spellchecking = function()
{
- if (this.env.spellcheck && !this.spellcheck_ready) {
- $(this.env.spellcheck.spell_span).trigger('click');
+ var ed;
+ if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody))) {
+ if (ed.plugins.spellchecker && ed.plugins.spellchecker.active)
+ ed.execCommand('mceSpellCheck');
+ }
+ else if ((ed = this.env.spellcheck) && !this.spellcheck_ready) {
+ $(ed.spell_span).trigger('click');
this.set_spellcheck_state('ready');
}
};
@@ -3069,32 +3053,6 @@
return true;
};
- this.show_attachment_form = function(a)
- {
- if (!this.gui_objects.uploadbox)
- return false;
-
- var elm, list;
- if (elm = this.gui_objects.uploadbox) {
- if (a && (list = this.gui_objects.attachmentlist)) {
- var pos = $(list).offset();
- elm.style.top = (pos.top + list.offsetHeight + 10) + 'px';
- elm.style.left = pos.left + 'px';
- }
-
- $(elm).toggle();
- }
-
- // clear upload form
- try {
- if (!a && this.gui_objects.attachmentform != this.gui_objects.messageform)
- this.gui_objects.attachmentform.reset();
- }
- catch(e){} // ignore errors
-
- return true;
- };
-
// upload attachment file
this.upload_file = function(form)
{
@@ -3157,8 +3115,6 @@
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)
@@ -3246,7 +3202,7 @@
if (value != '') {
var addurl = '';
if (this.message_list) {
- this.message_list.clear();
+ this.clear_message_list();
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) {
@@ -3557,8 +3513,8 @@
this.list_contacts = function(src, group, page)
{
- var add_url = '';
- var target = window;
+ var add_url = '',
+ target = window;
if (!src)
src = this.env.source;
@@ -3567,8 +3523,7 @@
return false;
if (src != this.env.source) {
- page = 1;
- this.env.current_page = page;
+ page = this.env.current_page = 1;
this.reset_qsearch();
}
else if (group != this.env.group)
@@ -3728,7 +3683,7 @@
this.contact_list.remove_row(cid);
this.contact_list.init_row(row);
this.contact_list.selection[0] = newcid;
- ow.style.display = '';
+ row.style.display = '';
}
return true;
@@ -3768,24 +3723,24 @@
};
- this.add_contact_group = function()
+ this.group_create = function()
{
if (!this.gui_objects.folderlist || !this.env.address_sources[this.env.source].groups)
return;
if (!this.name_input) {
this.name_input = $('<input>').attr('type', 'text');
- this.name_input.bind('keypress', function(e){ return rcmail.add_input_keypress(e); });
+ this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
this.name_input_li = $('<li>').addClass('contactgroup').append(this.name_input);
var li = this.get_folder_li(this.env.source)
this.name_input_li.insertAfter(li);
}
- this.name_input.select();
+ this.name_input.select().focus();
};
- this.rename_contact_group = function()
+ this.group_rename = function()
{
if (!this.env.group || !this.gui_objects.folderlist)
return;
@@ -3793,7 +3748,7 @@
if (!this.name_input) {
this.enable_command('list', 'listgroup', false);
this.name_input = $('<input>').attr('type', 'text').val(this.env.contactgroups['G'+this.env.source+this.env.group].name);
- this.name_input.bind('keypress', function(e){ return rcmail.add_input_keypress(e); });
+ this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
this.env.group_renaming = true;
var link, li = this.get_folder_li(this.env.source+this.env.group, 'rcmliG');
@@ -3802,10 +3757,10 @@
}
}
- this.name_input.select();
+ this.name_input.select().focus();
};
- this.delete_contact_group = function()
+ this.group_delete = function()
{
if (this.env.group)
this.http_post('group-delete', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group), true);
@@ -3827,7 +3782,7 @@
};
// handler for keyboard events on the input field
- this.add_input_keypress = function(e)
+ this.add_input_keydown = function(e)
{
var key = rcube_event.get_keycode(e);
@@ -3920,9 +3875,9 @@
this.subscription_list.row_init = function (row) {
var anchors = row.obj.getElementsByTagName('a');
if (anchors[0])
- anchors[0].onclick = function() { p.rename_folder(row.id); return false; };
+ anchors[0].onclick = function() { p.command('rename-folder', row.id); return false; };
if (anchors[1])
- anchors[1].onclick = function() { p.delete_folder(row.id); return false; };
+ anchors[1].onclick = function() { p.command('delete-folder', row.id); return false; };
row.obj.onmouseover = function() { p.focus_subscription(row.id); };
row.obj.onmouseout = function() { p.unfocus_subscription(row.id); };
};
@@ -3961,7 +3916,7 @@
if (action=='edit-identity' && (!id || id==this.env.iid))
return false;
- var add_url = '', target = window;
+ var add_url = '', target = window;
if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
add_url = '&_framed=1';
@@ -4102,7 +4057,7 @@
reg = new RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
- this.name_input.onkeypress = function(e){ rcmail.name_input_keypress(e); };
+ this.name_input.onkeydown = function(e){ rcmail.name_input_keydown(e); };
row.cells[0].replaceChild(this.name_input, row.cells[0].firstChild);
this.edit_folder = id;
@@ -4125,7 +4080,7 @@
};
// handler for keyboard events on the input field
- this.name_input_keypress = function(e)
+ this.name_input_keydown = function(e)
{
var key = rcube_event.get_keycode(e);
@@ -4197,19 +4152,18 @@
this.goto_url('folders');
return false;
}
- else {
- // clone a table row if there are existing rows
- var row = this.clone_table_row(refrow);
- row.id = id;
- if (before && (before = this.get_folder_row_id(before)))
- tbody.insertBefore(row, document.getElementById(before));
- else
- tbody.appendChild(row);
+ // clone a table row if there are existing rows
+ var row = this.clone_table_row(refrow);
+ row.id = id;
- if (replace)
- tbody.removeChild(replace);
- }
+ if (before && (before = this.get_folder_row_id(before)))
+ tbody.insertBefore(row, document.getElementById(before));
+ else
+ tbody.appendChild(row);
+
+ if (replace)
+ tbody.removeChild(replace);
// add to folder/row-ID map
this.env.subscriptionrows[row.id] = [name, display_name, 0];
@@ -4217,21 +4171,22 @@
// set folder name
row.cells[0].innerHTML = display_name;
- // set messages count to zero
- if (!replace)
+ if (!replace) {
+ // set messages count to zero
row.cells[1].innerHTML = '*';
- if (!replace && row.cells[2] && row.cells[2].firstChild.tagName.toLowerCase()=='input') {
- row.cells[2].firstChild.value = name;
- row.cells[2].firstChild.checked = true;
- }
+ // update subscription/threading checkboxes
+ $('input[name="_subscribed[]"]', row).val(name).attr('checked', true);
+ $('input[name="_threaded[]"]', row).val(name).attr('checked', false);
- // add new folder to rename-folder list and clear input field
- if (!replace && (form = this.gui_objects.editform)) {
- if (form.elements['_folder_oldname'])
- form.elements['_folder_oldname'].options[form.elements['_folder_oldname'].options.length] = new Option(name,name);
- if (form.elements['_folder_name'])
- form.elements['_folder_name'].value = '';
+ var elem;
+ // add new folder to rename-folder list and clear input field
+ if (form = this.gui_objects.editform) {
+ if (elem = form.elements['_folder_oldname'])
+ elem.options[elem.options.length] = new Option(name, name);
+ if (elem = form.elements['_folder_name'])
+ elem.value = '';
+ }
}
this.init_subscription_list();
@@ -4285,17 +4240,17 @@
}
}
- if (form && form.elements['_folder_newname'])
- form.elements['_folder_newname'].value = '';
+ if (form && (elm = form.elements['_folder_newname']))
+ elm.value = '';
};
- this.subscribe_folder = function(folder)
+ this.subscribe = function(folder)
{
if (folder)
this.http_post('subscribe', '_mbox='+urlencode(folder));
};
- this.unsubscribe_folder = function(folder)
+ this.unsubscribe = function(folder)
{
if (folder)
this.http_post('unsubscribe', '_mbox='+urlencode(folder));
@@ -4553,6 +4508,7 @@
cont = '<div class="'+type+'">'+cont+'</div>';
var obj = $(this.gui_objects.message).html(cont).show();
+ this.gui_objects.message.__type = type;
if (type!='loading')
obj.bind('mousedown', function(){ ref.hide_message(); return true; });
@@ -4564,8 +4520,25 @@
// make a message row disapear
this.hide_message = function(fade)
{
+ var msg;
if (this.gui_objects.message)
- $(this.gui_objects.message).unbind()[(fade?'fadeOut':'hide')]();
+ msg = this.gui_objects.message;
+ else if (this.env.framed && parent.rcmail)
+ msg = parent.rcmail.gui_objects.message;
+
+ if (msg) {
+ $(msg).unbind()[(fade?'fadeOut':'hide')]();
+ msg.__type = null;
+ }
+ };
+
+ // get type of currently displayed message
+ this.message_type = function()
+ {
+ if (this.gui_objects.message)
+ return this.gui_objects.message.__type;
+ else if (this.env.framed && parent.rcmail && parent.rcmail.gui_objects.message)
+ return parent.rcmail.gui_objects.message.__type;
};
// mark a mailbox as selected and set environment variable
@@ -4675,7 +4648,7 @@
this.set_quota = function(content)
{
if (content && this.gui_objects.quotadisplay) {
- if (typeof(content) == 'object')
+ if (typeof(content) == 'object' && content.type == 'image')
this.percent_indicator(this.gui_objects.quotadisplay, content);
else
$(this.gui_objects.quotadisplay).html(content);
@@ -4826,6 +4799,9 @@
quota_width = parseInt(quota / 100 * width),
pos = $(obj).position();
+ // Opera bug?
+ pos.top = Math.max(0, pos.top);
+
this.env.indicator_width = width;
this.env.indicator_height = height;
@@ -4834,6 +4810,9 @@
quota_width = width;
quota = 100;
}
+
+ if (data.title)
+ data.title = this.get_label('quota') + ': ' + data.title;
// main div
var main = $('<div>');
@@ -4865,6 +4844,8 @@
// replace quota image
$(obj).html('').append(bar1).append(bar2).append(main);
+ // update #quotaimg title
+ $('#quotaimg').attr('title', data.title);
};
/********************************************************/
@@ -4910,25 +4891,41 @@
this.goto_url = function(action, query, lock)
{
- var querystring = query ? '&'+query : '';
- this.redirect(this.env.comm_path+'&_action='+action+querystring, lock);
+ var url = this.env.comm_path,
+ querystring = query ? '&'+query : '';
+
+ // overwrite task name
+ if (action.match(/([a-z]+)\/([a-z-_]+)/)) {
+ action = RegExp.$2;
+ url = url.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
+ }
+
+ this.redirect(url+'&_action='+action+querystring, lock);
};
// send a http request to the server
- this.http_request = function(action, querystring, lock)
+ this.http_request = function(action, query, lock)
{
+ var url = this.env.comm_path;
+
+ // overwrite task name
+ if (action.match(/([a-z]+)\/([a-z-_]+)/)) {
+ action = RegExp.$2;
+ url = url.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
+ }
+
// trigger plugin hook
- var result = this.triggerEvent('request'+action, querystring);
+ var result = this.triggerEvent('request'+action, query);
+
if (typeof result != 'undefined') {
// abort if one the handlers returned false
if (result === false)
return false;
else
- querystring = result;
+ query = result;
}
- querystring += (querystring ? '&' : '') + '_remote=1';
- var url = this.env.comm_path + '&_action=' + action + '&' + querystring;
+ url += '&_remote=1&_action=' + action + (query ? '&' : '') + query;
// send request
console.log('HTTP GET: ' + url);
@@ -4938,7 +4935,15 @@
// send a http POST request to the server
this.http_post = function(action, postdata, lock)
{
- var url = this.env.comm_path+'&_action=' + action;
+ var url = this.env.comm_path;
+
+ // overwrite task name
+ if (action.match(/([a-z]+)\/([a-z-_]+)/)) {
+ action = RegExp.$2;
+ url = url.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
+ }
+
+ url += '&_action=' + action;
if (postdata && typeof(postdata) == 'object') {
postdata._remote = 1;
@@ -5079,9 +5084,9 @@
if (this._int)
clearInterval(this._int);
- if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.mailboxlist)
+ if (this.env.keep_alive && !this.env.framed && this.task == 'mail' && this.gui_objects.mailboxlist)
this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
- else if (this.env.keep_alive && !this.env.framed && this.task!='login')
+ else if (this.env.keep_alive && !this.env.framed && this.task != 'login' && this.env.action != 'print')
this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
};
@@ -5174,19 +5179,28 @@
}
};
- // set all fields of a form disabled
+ // disable/enable all fields of a form
this.lock_form = function(form, lock)
{
if (!form || !form.elements)
return;
- var type;
- for (var n=0, len=form.elements.length; n<len; n++) {
- type = form.elements[n];
- if (type == 'hidden')
+ var n, len, elm;
+
+ if (lock)
+ this.disabled_form_elements = [];
+
+ for (n=0, len=form.elements.length; n<len; n++) {
+ elm = form.elements[n];
+
+ if (elm.type == 'hidden')
continue;
- form.elements[n].disabled = lock;
+ // remember which elem was disabled before lock
+ if (lock && elm.disabled)
+ this.disabled_form_elements.push(elm);
+ else if (lock || $.inArray(elm, this.disabled_form_elements)<0)
+ elm.disabled = lock;
}
};
@@ -5196,3 +5210,4 @@
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