summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2015-04-19 09:02:04 +0200
committerAleksander Machniak <alec@alec.pl>2015-04-19 09:02:04 +0200
commitc095e6329c38bf759f42b414db9082d7f31aba18 (patch)
tree48fef5df1ad5be7e6da6200dd013cf2a27848c4f
parent28331d5ed23029753e0a8c5202e60b02716628cc (diff)
Fix message highligh regression from last commit (#1490363)
-rw-r--r--program/js/app.js30
1 files changed, 16 insertions, 14 deletions
diff --git a/program/js/app.js b/program/js/app.js
index c11ae7762..b4b125f3f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -7500,34 +7500,36 @@ function rcube_webmail()
this.env.qsearch = null;
case 'list':
if (this.task == 'mail') {
- var is_multifolder = this.is_multifolder_listing();
+ var is_multifolder = this.is_multifolder_listing(),
+ list = this.message_list,
+ uid = this.env.list_uid;
+
this.enable_command('show', 'select-all', 'select-none', this.env.messagecount > 0);
this.enable_command('expunge', this.env.exists && !is_multifolder);
this.enable_command('purge', this.purge_mailbox_test() && !is_multifolder);
this.enable_command('import-messages', !is_multifolder);
this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount && !is_multifolder);
- if (this.message_list) {
- var list = this.message_list, uid = this.env.list_uid;
-
- // highlight message row when we're back from message page
- if (uid) {
- if (!list.rows[uid])
- uid += '-' + this.env.mailbox;
- if (list.rows[uid]) {
- list.select(uid);
+ if (list) {
+ if (response.action == 'list' || response.action == 'search') {
+ // highlight message row when we're back from message page
+ if (uid) {
+ if (!list.rows[uid])
+ uid += '-' + this.env.mailbox;
+ if (list.rows[uid]) {
+ list.select(uid);
+ }
+ delete this.env.list_uid;
}
- delete this.env.list_uid;
- }
- if (response.action == 'list' || response.action == 'search') {
this.enable_command('set-listmode', this.env.threads && !is_multifolder);
if (list.rowcount > 0)
list.focus();
this.msglist_select(list);
}
- this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:list.rowcount });
+ if (response.action != 'getunread')
+ this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:list.rowcount });
}
}
else if (this.task == 'addressbook') {