From a1f7e90a0e14272589552bf53e99dc40b8310a4e Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 6 May 2010 09:21:36 +0000 Subject: - Fix select_all_mode value after selecting a message (#1486720) --- CHANGELOG | 1 + program/js/app.js | 17 +++++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ec47d59ba..ec7509302 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix select_all_mode value after selecting a message (#1486720) - Set focus to editor on reply in HTML mode (#1486632) - Fix composing in HTML jumps cursor to body instead of recipients (#1486674) - Allow columns order change per user - drag&drop (#1485795) diff --git a/program/js/app.js b/program/js/app.js index 23a64e66e..00e6c8e47 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -87,7 +87,7 @@ function rcube_webmail() if (sel) button_prop.sel = sel; if (over) button_prop.over = over; - this.buttons[command][this.buttons[command].length] = button_prop; + this.buttons[command][this.buttons[command].length] = button_prop; }; // register a specific gui object @@ -1399,15 +1399,12 @@ function rcube_webmail() var selected = list.get_single_selection() != null; // Hide certain command buttons when Drafts folder is selected - if (this.env.mailbox == this.env.drafts_mailbox) { - this.enable_command('reply', 'reply-all', 'forward', false); - this.enable_command('show', 'print', 'open', 'edit', 'download', 'viewsource', selected); - this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false)); - } - else { - this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', 'edit', 'open', 'download', 'viewsource', selected); - this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false)); - } + this.enable_command('reply', 'reply-all', 'forward', this.env.mailbox == this.env.drafts_mailbox ? false : selected); + this.enable_command('show', 'print', 'open', 'edit', 'download', 'viewsource', selected); + this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false)); + + // reset all-pages-selection + this.select_all_mode = false; // start timer for message preview (wait for double click) if (selected && this.env.contentframe && !list.multi_selecting) -- cgit v1.2.3