banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug where contacts widget in compose could be incorrectly initialized with treelist widget (T998)

Browse Source 
Fix typo in command name (list-adresses -> list-addresses)
pull/323/head
Aleksander Machniak 9 years ago
parent 89a49dd370
commit d686b57c72
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File

13
program/js/app.js
Unescape Escape View File

@ -295,7 +295,7 @@ function rcube_webmail()
else if (this.env.action == 'compose') { else if (this.env.action == 'compose') {
this.env.address_group_stack = []; this.env.address_group_stack = [];
this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel',
'toggle-editor', 'list-adresses', 'pushgroup', 'search', 'reset-search', 'extwin', 'toggle-editor', 'list-addresses', 'pushgroup', 'search', 'reset-search', 'extwin',
'insert-response', 'save-response', 'menu-open', 'menu-close']; 'insert-response', 'save-response', 'menu-open', 'menu-close'];
if (this.env.drafts_mailbox) if (this.env.drafts_mailbox)
@ -381,7 +381,7 @@ function rcube_webmail()
if (this.gui_objects.addressbookslist) { if (this.gui_objects.addressbookslist) {
this.gui_objects.folderlist = this.gui_objects.addressbookslist; this.gui_objects.folderlist = this.gui_objects.addressbookslist;
this.enable_command('list-adresses', true); this.enable_command('list-addresses', true);
} }
// ask user to send MDN // ask user to send MDN
@ -581,7 +581,12 @@ function rcube_webmail()
this.display_message.apply(this, this.pending_message); this.display_message.apply(this, this.pending_message);
// init treelist widget // init treelist widget
if (this.gui_objects.folderlist && window.rcube_treelist_widget) { if (this.gui_objects.folderlist && window.rcube_treelist_widget
// some plugins may load rcube_treelist_widget and there's one case
// when this will cause problems - addressbook widget in compose,
// which already has been initialized using rcube_list_widget
&& this.gui_objects.folderlist != this.gui_objects.addressbookslist
) {
this.treelist = new rcube_treelist_widget(this.gui_objects.folderlist, { this.treelist = new rcube_treelist_widget(this.gui_objects.folderlist, {
selectable: true, selectable: true,
id_prefix: 'rcmli', id_prefix: 'rcmli',
@ -1161,7 +1166,7 @@ function rcube_webmail()
this.change_identity($("[name='_from']")[0], true); this.change_identity($("[name='_from']")[0], true);
break; break;
case 'list-adresses': case 'list-addresses':
this.list_contacts(props); this.list_contacts(props);
this.enable_command('add-recipient', false); this.enable_command('add-recipient', false);
break; break;

2
program/steps/mail/compose.inc
Unescape Escape View File

@ -1850,7 +1850,7 @@ function rcmail_addressbook_list($attrib = array())
'id' => 'rcmli%s', 'class' => '%s'), 'id' => 'rcmli%s', 'class' => '%s'),
html::a(array('href' => '#list', html::a(array('href' => '#list',
'rel' => '%s', 'rel' => '%s',
'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('list-adresses','%s',this)"), '%s')); 'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('list-addresses','%s',this)"), '%s'));
foreach ($RCMAIL->get_address_sources(false, true) as $j => $source) { foreach ($RCMAIL->get_address_sources(false, true) as $j => $source) {
$id = strval(strlen($source['id']) ? $source['id'] : $j); $id = strval(strlen($source['id']) ? $source['id'] : $j);

Write Preview
Loading…
Cancel
Save