summaryrefslogtreecommitdiff
path: root/roundcubemail/program/js/app.js
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-10 07:02:45 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-10 07:02:45 +0000
commitbe1403c3c0e2881faacca7510562ee2817ff11af (patch)
treeb41510bde34a1c09025824ca99bcccf1fa285b5b /roundcubemail/program/js/app.js
parentb8decda77774e09b445c23e05813607ca9c62325 (diff)
- Fix so "Back" from compose/show doesn't reset search request (#1488238)
git-svn-id: https://svn.roundcube.net/trunk@6054 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/js/app.js')
-rw-r--r--roundcubemail/program/js/app.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 30333d89b..025a366f1 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -569,7 +569,8 @@ function rcube_webmail()
break;
case 'list':
- this.reset_qsearch();
+ if (props && props != '')
+ this.reset_qsearch();
if (this.task == 'mail') {
this.list_mailbox(props);
this.set_button_titles();
@@ -857,6 +858,9 @@ function rcube_webmail()
url += '&_mbox='+urlencode(this.env.mailbox);
if (props)
url += '&_to='+urlencode(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') {