summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2015-01-15 10:56:17 +0100
committerAleksander Machniak <alec@alec.pl>2015-01-15 10:59:59 +0100
commitf640e144dc1ee8eb663d25fa265ca5a796b348d2 (patch)
tree7360babc3969e2d0190f761cf9ab08f31d930612 /program/js
parent56caf850794587a8f3f644c6823daef2d659360f (diff)
Fix bug where search was reset after returning from compose opened by reply button(s)
Conflicts: program/js/app.js
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js9
1 files changed, 3 insertions, 6 deletions
diff --git a/program/js/app.js b/program/js/app.js
index f132a2c3b..17fc99dc2 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -983,12 +983,9 @@ function rcube_webmail()
url = {};
if (this.task == 'mail') {
- url._mbox = this.env.mailbox;
+ url = {_mbox: this.env.mailbox, _search: this.env.search_request};
if (props)
url._to = props;
- // also send search request so we can go back to search result after message is sent
- if (this.env.search_request)
- url._search = this.env.search_request;
}
// modify url if we're in addressbook
else if (this.task == 'addressbook') {
@@ -1089,9 +1086,9 @@ function rcube_webmail()
case 'reply-list':
case 'reply':
if (uid = this.get_single_uid()) {
- url = {_reply_uid: uid, _mbox: this.env.mailbox};
+ url = {_reply_uid: uid, _mbox: this.env.mailbox, _search: this.env.search_request};
+ // do reply-list, when list is detected and popup menu wasn't used
if (command == 'reply-all')
- // do reply-list, when list is detected and popup menu wasn't used
url._all = (!props && this.env.reply_all_mode == 1 && this.commands['reply-list'] ? 'list' : 'all');
else if (command == 'reply-list')
url._all = 'list';