From 8e3a6039cfefb8f351d2696ebdcfa26cc5d4cef9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 13 Apr 2010 03:24:09 -0400
Subject: [PATCH] Assign newly created contacts to the active group (#1486626) and fix group selection display (#1486619)
---
program/js/app.js | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index ae55cc4..8b5460a 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -525,7 +525,7 @@
this.reset_qsearch();
this.list_contacts(props);
- this.enable_command('add', 'import', (this.env.address_sources && !this.env.address_sources[props].readonly));
+ this.enable_command('add', 'import', (this.env.address_sources && !this.env.address_sources[this.env.source].readonly));
}
break;
@@ -1273,6 +1273,9 @@
if (this.preview_timer)
clearTimeout(this.preview_timer);
+ if (this.preview_read_timer)
+ clearTimeout(this.preview_read_timer);
+
// save folderlist and folders location/sizes for droptarget calculation in drag_move()
if (this.gui_objects.folderlist && model)
{
@@ -1438,6 +1441,9 @@
if (this.preview_timer)
clearTimeout(this.preview_timer);
+ if (this.preview_read_timer)
+ clearTimeout(this.preview_read_timer);
+
var selected = list.get_single_selection() != null;
// Hide certain command buttons when Drafts folder is selected
@@ -1464,6 +1470,9 @@
{
if (this.preview_timer)
clearTimeout(this.preview_timer);
+
+ if (this.preview_read_timer)
+ clearTimeout(this.preview_read_timer);
var uid = list.get_single_selection();
if (uid && this.env.mailbox == this.env.drafts_mailbox)
@@ -1754,24 +1763,25 @@
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
- {
+ 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_message(id, 'unread', false);
- this.update_thread_root(id, 'read');
- 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');
+ if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read >= 0) {
+ this.preview_read_timer = window.setTimeout(function() {
+ ref.set_message(id, 'unread', false);
+ ref.update_thread_root(id, 'read');
+ if (ref.env.unread_counts[ref.env.mailbox]) {
+ ref.env.unread_counts[ref.env.mailbox] -= 1;
+ ref.set_unread_count(ref.env.mailbox, ref.env.unread_counts[ref.env.mailbox], ref.env.mailbox == 'INBOX');
}
- }
+ if (ref.env.preview_pane_mark_read > 0)
+ ref.http_post('mark', '_uid='+id+'&_flag=read');
+ }, this.env.preview_pane_mark_read * 1000);
}
- };
+ }
+ };
this.show_contentframe = function(show)
{
@@ -3238,9 +3248,11 @@
var insert = '';
// insert all members of a group
- if (typeof this.env.contacts[id] == 'object' && this.env.contacts[id].members) {
- for (var i=0; i < this.env.contacts[id].members.length; i++)
- insert += this.env.contacts[id].members[i] + ', ';
+ if (typeof this.env.contacts[id] == 'object' && this.env.contacts[id].id) {
+ insert += this.env.contacts[id].name + ', ';
+ this.group2expand = $.extend({}, this.env.contacts[id]);
+ this.group2expand.input = this.ksearch_input;
+ this.http_request('group-expand', '_source='+urlencode(this.env.contacts[id].source)+'&_gid='+urlencode(this.env.contacts[id].id), false);
}
else if (typeof this.env.contacts[id] == 'string')
insert = this.env.contacts[id] + ', ';
@@ -3251,6 +3263,14 @@
cpos = p+insert.length;
if (this.ksearch_input.setSelectionRange)
this.ksearch_input.setSelectionRange(cpos, cpos);
+ };
+
+ this.replace_group_recipients = function(id, recipients)
+ {
+ if (this.group2expand && this.group2expand.id == id) {
+ this.group2expand.input.value = this.group2expand.input.value.replace(this.group2expand.name, recipients);
+ this.group2expand = null;
+ }
};
// address search processor
@@ -3286,7 +3306,7 @@
if (old_value && old_value.length && this.env.contacts && !this.env.contacts.length && q.indexOf(old_value) == 0)
return;
- this.display_message(this.get_label('searching'), 'loading', true);
+ this.display_message(this.get_label('searching'), 'loading', false);
this.http_post('autocomplete', '_search='+urlencode(q));
};
@@ -3408,8 +3428,7 @@
// currently all groups belong to the local address book
if (group)
src = 0;
-
- if (!src)
+ else if (!src)
src = this.env.source;
if (page && this.current_page == page && src == this.env.source && group == this.env.group)
@@ -3424,8 +3443,7 @@
else if (group != this.env.group)
page = this.env.current_page = 1;
- this.select_folder(src, this.env.source);
- this.select_folder(group, this.env.group, 'rcmliG');
+ this.select_folder((group ? 'G'+group : src), (this.env.group ? 'G'+this.env.group : this.env.source));
this.env.source = src;
this.env.group = group;
@@ -3497,7 +3515,7 @@
if (action && (cid || action=='add') && !this.drag_active)
{
this.set_busy(true);
- target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_cid='+urlencode(cid) + add_url;
+ target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+'&_cid='+urlencode(cid) + add_url;
}
return true;
};
@@ -3632,6 +3650,7 @@
return;
if (!this.name_input) {
+ this.enable_command('list', 'listgroup', false);
this.name_input = document.createElement('input');
this.name_input.type = 'text';
this.name_input.value = this.env.contactgroups['G'+this.env.group].name;
@@ -3659,10 +3678,14 @@
{
var li, key = 'G'+id;
if ((li = this.get_folder_li(key))) {
+ this.triggerEvent('removegroup', { id:id, li:li });
+
li.parentNode.removeChild(li);
delete this.env.contactfolders[key];
delete this.env.contactgroups[key];
}
+
+ this.list_contacts(null, 0);
};
// handler for keyboard events on the input field
@@ -3702,6 +3725,8 @@
this.name_input.parentNode.removeChild(this.name_input);
this.name_input = null;
}
+
+ this.enable_command('list', 'listgroup', true);
};
// callback for creating a new contact group
@@ -3716,6 +3741,8 @@
var link = $('<a>').attr('href', '#').attr('onclick', "return rcmail.command('listgroup','"+prop.id+"',this)").html(prop.name);
var li = $('<li>').attr('id', 'rcmli'+key).addClass('contactgroup').append(link);
$(this.gui_objects.folderlist).append(li);
+
+ this.triggerEvent('insertgroup', { id:prop.id, name:prop.name, li:li[0] });
};
// callback for renaming a contact group
@@ -3729,6 +3756,7 @@
link.innerHTML = name;
this.env.contactfolders[key].name = this.env.contactgroups[key].name = name;
+ this.triggerEvent('updategroup', { id:id, name:name, li:li[0] });
};
@@ -4642,6 +4670,13 @@
addrbook_show_images.disabled = !checkbox.checked;
}
+ this.toggle_preview_pane = function(checkbox)
+ {
+ var preview_pane_mark_read;
+ if (preview_pane_mark_read = document.getElementById('rcmfd_preview_pane_mark_read'))
+ preview_pane_mark_read.disabled = !checkbox.checked;
+ }
+
// display fetched raw headers
this.set_headers = function(content)
{
--
Gitblit v1.9.1