From e224b002c08968ea2085c260a316f4357b81573e Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 12 Jan 2011 13:31:55 -0500
Subject: [PATCH] Missed some replacements in previous commit...
---
program/js/app.js | 395 +++++++++++++++++++++++---------------------------------
1 files changed, 164 insertions(+), 231 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index cc5da4e..280322c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3,7 +3,7 @@
| Roundcube Webmail Client Script |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2010, Roundcube Dev, - Switzerland |
+ | Copyright (C) 2005-2010, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
@@ -37,7 +37,7 @@
// webmail client settings
this.dblclick_time = 500;
- this.message_time = 1500;
+ this.message_time = 2000;
this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');
@@ -343,8 +343,15 @@
this.enable_command('add', this.env.identities_level < 2);
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);
+ else if (this.env.action=='folders') {
+ this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', true);
+ }
+ else if (this.env.action == 'edit-folder' && this.gui_objects.editform) {
+ this.enable_command('save', 'folder-size', true);
+ parent.rcmail.env.messagecount = this.env.messagecount;
+ parent.rcmail.enable_command('purge', this.env.messagecount);
+ $("input[type='text']").first().select();
+ }
if (this.gui_objects.identitieslist) {
this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist, {multiselect:false, draggable:false, keyboard:false});
@@ -1125,7 +1132,7 @@
else if (delay)
window.setTimeout(function(){ rcmail.reload(); }, delay);
else if (window.location)
- location.href = this.env.comm_path;
+ location.href = this.env.comm_path + (this.env.action ? '&_action='+this.env.action : '');
};
// Add variable to GET string, replace old value if exists
@@ -1534,7 +1541,7 @@
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')
- allow = (id != this.env.folder);
+ allow = (id != this.env.mailbox);
else if (this.task == 'addressbook') {
if (id != this.env.source && this.env.contactfolders[id]) {
if (this.env.contactfolders[id].type == 'group') {
@@ -1910,7 +1917,7 @@
var url = '', target = window;
if (!mbox)
- mbox = this.env.mailbox;
+ mbox = this.env.mailbox ? this.env.mailbox : 'INBOX';
if (add_url)
url += add_url;
@@ -2379,8 +2386,10 @@
}
}
+ add_url += '&_uid='+this.uids_to_list(a_uids);
+
// send request to server
- this.http_post('copy', '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
+ this.http_post('copy', '_mbox='+urlencode(this.env.mailbox)+add_url, lock);
};
// move selected messages to the specified mailbox
@@ -2393,8 +2402,8 @@
if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
return;
- var lock = false;
- var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
+ var lock = false,
+ add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
// show wait message
if (this.env.action == 'show') {
@@ -2735,24 +2744,23 @@
this.expunge_mailbox = function(mbox)
{
- var lock = false;
- var add_url = '';
+ var lock = false,
+ url = '_mbox='+urlencode(mbox);
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
lock = this.set_busy(true, 'loading');
- add_url = '&_reload=1';
+ url += '&_reload=1';
}
// send request to server
- var url = '_mbox='+urlencode(mbox);
- this.http_post('expunge', url+add_url, lock);
+ this.http_post('expunge', url, lock);
};
this.purge_mailbox = function(mbox)
{
- var lock = false;
- var add_url = '';
+ var lock = false,
+ url = '_mbox='+urlencode(mbox);
if (!confirm(this.get_label('purgefolderconfirm')))
return false;
@@ -2760,13 +2768,11 @@
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
lock = this.set_busy(true, 'loading');
- add_url = '&_reload=1';
+ url += '&_reload=1';
}
// send request to server
- var url = '_mbox='+urlencode(mbox);
- this.http_post('purge', url+add_url, lock);
- return true;
+ this.http_post('purge', url, lock);
};
// test if purge command is allowed
@@ -2813,7 +2819,7 @@
input_subject = $("input[name='_subject']"),
input_message = $("[name='_message']").get(0),
html_mode = $("input[name='_is_html']").val() == '1',
- ac_fields = ['cc', 'bcc', 'replyto', 'mailreplyto', 'mailfollowupto'];
+ ac_fields = ['cc', 'bcc', 'replyto', 'followupto'];
// init live search events
this.init_address_input_events(input_to);
@@ -3980,16 +3986,12 @@
this.init_subscription_list = function()
{
var p = this;
- this.subscription_list = new rcube_list_widget(this.gui_objects.subscriptionlist, {multiselect:false, draggable:true, keyboard:false, toggleselect:true});
+ this.subscription_list = new rcube_list_widget(this.gui_objects.subscriptionlist,
+ {multiselect:false, draggable:true, keyboard:false, toggleselect:true});
this.subscription_list.addEventListener('select', function(o){ p.subscription_select(o); });
this.subscription_list.addEventListener('dragstart', function(o){ p.drag_active = true; });
this.subscription_list.addEventListener('dragend', function(o){ p.subscription_move_folder(o); });
this.subscription_list.row_init = function (row) {
- var anchors = row.obj.getElementsByTagName('a');
- if (anchors[0])
- anchors[0].onclick = function() { p.command('rename-folder', row.id); return false; };
- if (anchors[1])
- 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); };
};
@@ -4066,18 +4068,18 @@
delim = RegExp.escape(this.env.delimiter),
reg = RegExp('['+delim+']?[^'+delim+']+$');
- if (this.drag_active && this.env.folder && (row = document.getElementById(id)))
+ if (this.drag_active && this.env.mailbox && (row = document.getElementById(id)))
if (this.env.subscriptionrows[id] &&
(folder = this.env.subscriptionrows[id][0])) {
if (this.check_droptarget(folder) &&
- !this.env.subscriptionrows[this.get_folder_row_id(this.env.folder)][2] &&
- (folder != this.env.folder.replace(reg, '')) &&
- (!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter))))) {
+ !this.env.subscriptionrows[this.get_folder_row_id(this.env.mailbox)][2] &&
+ (folder != this.env.mailbox.replace(reg, '')) &&
+ (!folder.match(new RegExp('^'+RegExp.escape(this.env.mailbox+this.env.delimiter))))) {
this.set_env('dstfolder', folder);
$(row).addClass('droptarget');
}
}
- else if (this.env.folder.match(new RegExp(delim))) {
+ else if (this.env.mailbox.match(new RegExp(delim))) {
this.set_env('dstfolder', this.env.delimiter);
$(this.subscription_list.frame).addClass('droptarget');
}
@@ -4097,15 +4099,19 @@
this.subscription_select = function(list)
{
var id, folder;
- if ((id = list.get_single_selection()) &&
- this.env.subscriptionrows['rcmrow'+id] &&
- (folder = this.env.subscriptionrows['rcmrow'+id][0]))
- this.set_env('folder', folder);
- else
- this.set_env('folder', null);
- if (this.gui_objects.createfolderhint)
- $(this.gui_objects.createfolderhint).html(this.env.folder ? this.get_label('addsubfolderhint') : '');
+ if (list && (id = list.get_single_selection()) &&
+ (folder = this.env.subscriptionrows['rcmrow'+id])
+ ) {
+ this.set_env('mailbox', folder[0]);
+ this.show_folder(folder[0]);
+ this.enable_command('delete-folder', !folder[2]);
+ }
+ else {
+ this.env.mailbox = null;
+ this.show_contentframe(false);
+ this.enable_command('delete-folder', 'purge', false);
+ }
};
this.subscription_move_folder = function(list)
@@ -4113,129 +4119,35 @@
var delim = RegExp.escape(this.env.delimiter),
reg = RegExp('['+delim+']?[^'+delim+']+$');
- if (this.env.folder && this.env.dstfolder && (this.env.dstfolder != this.env.folder) &&
- (this.env.dstfolder != this.env.folder.replace(reg, ''))) {
- var reg = new RegExp('[^'+delim+']*['+delim+']', 'g');
- var basename = this.env.folder.replace(reg, '');
- var newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
+ if (this.env.mailbox && this.env.dstfolder && (this.env.dstfolder != this.env.mailbox) &&
+ (this.env.dstfolder != this.env.mailbox.replace(reg, ''))
+ ) {
+ reg = new RegExp('[^'+delim+']*['+delim+']', 'g');
+ var lock = this.set_busy(true, 'foldermoving'),
+ basename = this.env.mailbox.replace(reg, ''),
+ newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
- var lock = this.set_busy(true, 'foldermoving');
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname), lock);
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.mailbox)+'&_folder_newname='+urlencode(newname), lock);
}
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)
+ this.create_folder = function()
{
- if (this.edit_folder)
- this.reset_folder_rename();
-
- var form;
- if ((form = this.gui_objects.editform) && form.elements['_folder_name']) {
- name = form.elements['_folder_name'].value;
-
- if (name.indexOf(this.env.delimiter)>=0) {
- alert(this.get_label('forbiddencharacter')+' ('+this.env.delimiter+')');
- return false;
- }
-
- if (this.env.folder && name != '')
- name = this.env.folder+this.env.delimiter+name;
-
- var lock = this.set_busy(true, 'foldercreating');
- this.http_post('create-folder', '_name='+urlencode(name), lock);
- }
- 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
- this.rename_folder = function(id)
- {
- var temp, row, form;
-
- // reset current renaming
- if (temp = this.edit_folder) {
- this.reset_folder_rename();
- if (temp == id)
- return;
- }
-
- if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id))) {
- var delim = RegExp.escape(this.env.delimiter),
- reg = new RegExp('.*['+delim+']');
-
- this.name_input = document.createElement('input');
- this.name_input.type = 'text';
- this.name_input.value = this.env.subscriptionrows[id][0].replace(reg, '');
-
- reg = new RegExp('['+delim+']?[^'+delim+']+$');
- this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
- 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;
- this.name_input.select();
-
- if (form = this.gui_objects.editform)
- form.onsubmit = function(){ return false; };
- }
- };
-
- // remove the input field and write the current mailbox name to the table cell
- this.reset_folder_rename = function()
- {
- var cell = this.name_input ? this.name_input.parentNode : null;
-
- if (cell && this.edit_folder && this.env.subscriptionrows[this.edit_folder])
- $(cell).html(this.env.subscriptionrows[this.edit_folder][1]);
-
- this.edit_folder = null;
- };
-
- // handler for keyboard events on the input field
- this.name_input_keydown = function(e)
- {
- var key = rcube_event.get_keycode(e);
-
- // enter
- if (key==13) {
- var newname = this.name_input ? this.name_input.value : null;
- if (this.edit_folder && newname) {
- if (newname.indexOf(this.env.delimiter)>=0) {
- alert(this.get_label('forbiddencharacter')+' ('+this.env.delimiter+')');
- return false;
- }
-
- if (this.name_input.__parent)
- newname = this.name_input.__parent + this.env.delimiter + newname;
-
- var lock = this.set_busy(true, 'folderrenaming');
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname), lock);
- }
- }
- // escape
- else if (key==27)
- this.reset_folder_rename();
+ this.show_folder('', this.env.mailbox);
};
// delete a specific mailbox with all its messages
- this.delete_folder = function(id)
+ this.delete_folder = function(name)
{
- var folder = this.env.subscriptionrows[id][0];
-
- if (this.edit_folder)
- this.reset_folder_rename();
+ var id = this.get_folder_row_id(name ? name : this.env.mailbox),
+ folder = this.env.subscriptionrows[id][0];
if (folder && confirm(this.get_label('deletefolderconfirm'))) {
var lock = this.set_busy(true, 'folderdeleting');
- this.http_post('delete-folder', '_mboxes='+urlencode(folder), lock);
- this.set_env('folder', null);
-
- $(this.gui_objects.createfolderhint).html('');
+ this.http_post('delete-folder', '_mbox='+urlencode(folder), lock);
}
};
@@ -4292,18 +4204,8 @@
// set messages count to zero
row.cells[1].innerHTML = '*';
- // update subscription/threading checkboxes
+ // update subscription checkbox
$('input[name="_subscribed[]"]', row).val(name).attr('checked', true);
- $('input[name="_threaded[]"]', row).val(name).attr('checked', false);
-
- 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();
@@ -4317,72 +4219,37 @@
// replace an existing table row with a new folder line
this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
{
- var form, elm,
- id = this.get_folder_row_id(oldfolder),
+ var id = this.get_folder_row_id(oldfolder),
row = document.getElementById(id);
// replace an existing table row (if found)
this.add_folder_row(newfolder, display_name, row, before);
-
- // rename folder in rename-folder dropdown
- if ((form = this.gui_objects.editform) && (elm = form.elements['_folder_oldname'])) {
- for (var i=0; i<elm.options.length; i++) {
- if (elm.options[i].value == oldfolder) {
- elm.options[i].text = display_name;
- elm.options[i].value = newfolder;
- break;
- }
- }
-
- form.elements['_folder_newname'].value = '';
- }
};
// 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)
{
- var form, elm, row, id = this.get_folder_row_id(folder);
+ var row, id = this.get_folder_row_id(folder);
if (id && (row = document.getElementById(id)))
row.style.display = 'none';
-
- // remove folder from rename-folder list
- if ((form = this.gui_objects.editform) && (elm = form.elements['_folder_oldname'])) {
- for (var i=0; i<elm.options.length; i++) {
- if (elm.options[i].value == folder) {
- elm.options[i] = null;
- break;
- }
- }
- }
-
- if (form && (elm = form.elements['_folder_newname']))
- elm.value = '';
};
this.subscribe = function(folder)
{
- if (folder)
- this.http_post('subscribe', '_mbox='+urlencode(folder));
+ if (folder) {
+ var lock = this.display_message(this.get_label('foldersubscribing'), 'loading');
+ this.http_post('subscribe', '_mbox='+urlencode(folder), lock);
+ }
};
this.unsubscribe = function(folder)
{
- if (folder)
- this.http_post('unsubscribe', '_mbox='+urlencode(folder));
- };
-
- this.enable_threading = function(folder)
- {
- if (folder)
- this.http_post('enable-threading', '_mbox='+urlencode(folder));
- };
-
- this.disable_threading = function(folder)
- {
- if (folder)
- this.http_post('disable-threading', '_mbox='+urlencode(folder));
+ if (folder) {
+ var lock = this.display_message(this.get_label('folderunsubscribing'), 'loading');
+ this.http_post('unsubscribe', '_mbox='+urlencode(folder), lock);
+ }
};
// helper method to find a specific mailbox row ID
@@ -4401,7 +4268,7 @@
var cell, td,
new_row = document.createElement('tr');
- for(var n=0; n<row.cells.length; n++) {
+ for (var n=0; n<row.cells.length; n++) {
cell = row.cells[n];
td = document.createElement('td');
@@ -4415,6 +4282,42 @@
}
return new_row;
+ };
+
+ // when user select a folder in manager
+ this.show_folder = function(folder, path, force)
+ {
+ var target = window,
+ url = '&_action=edit-folder&_mbox='+urlencode(folder);
+
+ if (path)
+ url += '&_path='+urlencode(path);
+
+ if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
+ target = window.frames[this.env.contentframe];
+ url += '&_framed=1';
+ }
+
+ if (String(target.location.href).indexOf(url) >= 0 && !force) {
+ this.show_contentframe(true);
+ }
+ else {
+ if (!this.env.frame_lock) {
+ (parent.rcmail ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
+ }
+ target.location.href = this.env.comm_path+url;
+ }
+ };
+
+ this.folder_size = function(folder)
+ {
+ var lock = this.set_busy(true, 'loading');
+ this.http_post('folder-size', '_mbox='+urlencode(folder), lock);
+ };
+
+ this.folder_size_update = function(size)
+ {
+ $('#folder-size').replaceWith(size);
};
@@ -4617,36 +4520,49 @@
type = type ? type : 'notice';
- var date = new Date(),
- id = type + date.getTime();
-
+ var ref = this,
+ key = msg,
+ date = new Date(),
+ id = type + date.getTime(),
+ timeout = this.message_time * (type == 'error' || type == 'warning' ? 2 : 1);
+
if (type == 'loading') {
+ key = 'loading';
+ timeout = this.env.request_timeout * 1000;
if (!msg)
msg = this.get_label('loading');
-
- // The same message of type 'loading' is already displayed
- if (this.messages[msg]) {
- this.messages[msg].elements.push(id);
- return id;
- }
}
- var ref = this,
- obj = $('<div>').addClass(type).html(msg),
- cont = $(this.gui_objects.message).show();
-
- if (type == 'loading') {
- obj.appendTo(cont);
- this.messages[msg] = {'obj': obj, 'elements': [id]};
- window.setTimeout(function() { rcmail.hide_message(id); }, this.env.request_timeout * 1000);
+ // The same message is already displayed
+ if (this.messages[key]) {
+ // replace label
+ if (this.messages[key].obj)
+ this.messages[key].obj.html(msg);
+ // store label in stack
+ if (type == 'loading') {
+ this.messages[key].labels.push({'id': id, 'msg': msg});
+ }
+ // add element and set timeout
+ this.messages[key].elements.push(id);
+ window.setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
return id;
}
- else {
- obj.appendTo(cont).bind('mousedown', function() { return ref.hide_message(obj); });
- window.setTimeout(function() { ref.hide_message(obj, true); },
- this.message_time * (type == 'error' ? 2 : 1));
- return obj;
+
+ // create DOM object and display it
+ var obj = $('<div>').addClass(type).html(msg).data('key', key),
+ cont = $(this.gui_objects.message).append(obj).show();
+
+ this.messages[key] = {'obj': obj, 'elements': [id]};
+
+ if (type == 'loading') {
+ this.messages[key].labels = [{'id': id, 'msg': msg}];
}
+ else {
+ obj.click(function() { return ref.hide_message(obj); });
+ }
+
+ window.setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
+ return id;
};
// make a message to disapear
@@ -4656,21 +4572,38 @@
if (this.is_framed())
return parent.rcmail.hide_message(obj, fade);
+ var k, n, i, msg, m = this.messages;
+
+ // Hide message by object, don't use for 'loading'!
if (typeof(obj) == 'object') {
- // custom message
$(obj)[fade?'fadeOut':'hide']();
+ msg = $(obj).data('key');
+ if (this.messages[msg])
+ delete this.messages[msg];
}
+ // Hide message by id
else {
- // 'loading' message
- var k, n, m = this.messages;
for (k in m) {
for (n in m[k].elements) {
if (m[k] && m[k].elements[n] == obj) {
m[k].elements.splice(n, 1);
+ // hide DOM element if last instance is removed
if (!m[k].elements.length) {
m[k].obj[fade?'fadeOut':'hide']();
delete m[k];
}
+ // set pending action label for 'loading' message
+ else if (k == 'loading') {
+ for (i in m[k].labels) {
+ if (m[k].labels[i].id == obj) {
+ delete m[k].labels[i];
+ }
+ else {
+ msg = m[k].labels[i].msg;
+ }
+ m[k].obj.html(msg);
+ }
+ }
}
}
}
--
Gitblit v1.9.1