- Fix buttons status after contacts deletion (#1485233)

release-0.6
alecpl 16 years ago
parent 2660a547b1
commit f74b283fd4

@ -8,6 +8,7 @@ CHANGELOG RoundCube Webmail
message (#1485288) message (#1485288)
- Removed PHP4 class constructors - Removed PHP4 class constructors
- Fix html message charset conversion for charsets with underline (#1485287) - Fix html message charset conversion for charsets with underline (#1485287)
- Fix buttons status after contacts deletion (#1485233)
2008/08/21 (estadtherr) 2008/08/21 (estadtherr)
---------- ----------

@ -2464,8 +2464,8 @@ function rcube_webmail()
else if (this.env.contentframe) else if (this.env.contentframe)
this.show_contentframe(false); this.show_contentframe(false);
this.enable_command('edit', id?true:false);
this.enable_command('compose', list.selection.length > 0); this.enable_command('compose', list.selection.length > 0);
this.enable_command('edit', (id && this.env.address_sources && !this.env.address_sources[this.env.source].readonly) ? true : false);
this.enable_command('delete', list.selection.length && this.env.address_sources && !this.env.address_sources[this.env.source].readonly); this.enable_command('delete', list.selection.length && this.env.address_sources && !this.env.address_sources[this.env.source].readonly);
return false; return false;
@ -3650,15 +3650,22 @@ function rcube_webmail()
{ {
case 'delete': case 'delete':
if (this.task == 'addressbook')
{
var uid = this.contact_list.get_selection();
this.enable_command('compose', (uid && this.contact_list.rows[uid]));
this.enable_command('delete', 'edit', (uid && this.contact_list.rows[uid] && this.env.address_sources && !this.env.address_sources[this.env.source].readonly));
break;
}
case 'moveto': case 'moveto':
if (this.env.action=='show') if (this.env.action=='show')
this.command('list'); this.command('list');
else if (this.message_list) else if (this.message_list)
this.message_list.init(); this.message_list.init();
case 'purge': case 'purge':
case 'expunge': case 'expunge':
if (!this.env.messagecount) if (!this.env.messagecount && this.task == 'mail')
{ {
// clear preview pane content // clear preview pane content
if (this.env.contentframe) if (this.env.contentframe)
@ -3667,7 +3674,6 @@ function rcube_webmail()
this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 'mark', 'viewsource', this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 'mark', 'viewsource',
'print', 'load-attachment', 'purge', 'expunge', 'select-all', 'select-none', 'sort', false); 'print', 'load-attachment', 'purge', 'expunge', 'select-all', 'select-none', 'sort', false);
} }
break; break;
case 'list': case 'list':
@ -3675,13 +3681,15 @@ function rcube_webmail()
case 'check-recent': case 'check-recent':
case 'getunread': case 'getunread':
this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0)); if (this.task == 'mail')
var mailboxtest = (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox {
this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
var mailboxtest = (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox
|| this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter)) || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter))
|| this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))) ? true : false; || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))) ? true : false;
this.enable_command('purge', (this.env.messagecount && mailboxtest)); this.enable_command('purge', (this.env.messagecount && mailboxtest));
}
break; break;
} }

Loading…
Cancel
Save