From 5f7ef8f95d428f7b22139d5dc00c875f2cbf838b Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 05 Jun 2014 10:44:43 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
CHANGELOG | 1 +
program/steps/mail/func.inc | 4 ++++
program/js/app.js | 24 ++++++++++++++++++++----
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 61a48f7..32a0c27 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Select/scroll to previously selected message when returning from message page (#1489023)
- Display a warning if popup window was blocked (#1489618)
- Remove (was: ...) from message subject on reply (#1489375)
- Update to TinyMCE 4.0 (#1489057)
diff --git a/program/js/app.js b/program/js/app.js
index ddc7b2f..9c2acfc 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2431,6 +2431,9 @@
url._framed = 1;
}
+ if (this.env.uid)
+ url._uid = this.env.uid;
+
// load message list to target frame/window
if (mbox) {
this.set_busy(true, 'loading');
@@ -7258,11 +7261,24 @@
this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount && !is_multifolder);
if ((response.action == 'list' || response.action == 'search') && 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);
+ }
+ delete this.env.list_uid;
+ }
+
this.enable_command('set-listmode', this.env.threads && !is_multifolder);
- if (this.message_list.rowcount > 0)
- this.message_list.focus();
- this.msglist_select(this.message_list);
- this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
+ if (list.rowcount > 0)
+ list.focus();
+ this.msglist_select(list);
+ this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:list.rowcount });
+
}
}
else if (this.task == 'addressbook') {
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 0dba3c1..ac343ad 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -104,6 +104,10 @@
}
}
+ if (!empty($_GET['_uid'])) {
+ $OUTPUT->set_env('list_uid', $_GET['_uid']);
+ }
+
// set configuration
$RCMAIL->set_env_config(array('delete_junk', 'flag_for_deletion', 'read_when_deleted',
'skip_deleted', 'display_next', 'message_extwin', 'compose_extwin', 'forward_attachment'));
--
Gitblit v1.9.1