summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-09-08 14:45:26 +0000
committeralecpl <alec@alec.pl>2011-09-08 14:45:26 +0000
commitb7fd98e338d64027c1df26c88e0fa66e1988dc74 (patch)
tree01585c011884ad89ab6c8f26501159da9efcd496 /program/js
parent71f72f928b2e637471268416131841b4ddca2bd0 (diff)
- Fix compacting folder resets message list filter (#1488076)
- Fix reset-search action so it resets list page number to 1
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js15
1 files changed, 8 insertions, 7 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 002f345ee..423361195 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -990,14 +990,14 @@ function rcube_webmail()
this.select_all_mode = false;
if (s && this.env.mailbox)
- this.list_mailbox(this.env.mailbox);
+ this.list_mailbox(this.env.mailbox, 1);
else if (s && this.task == 'addressbook') {
if (this.env.source == '') {
for (n in this.env.address_sources) break;
this.env.source = n;
this.env.group = '';
}
- this.list_contacts(this.env.source, this.env.group);
+ this.list_contacts(this.env.source, this.env.group, 1);
}
break;
@@ -2797,14 +2797,15 @@ function rcube_webmail()
this.expunge_mailbox = function(mbox)
{
- var lock = false,
- url = '_mbox='+urlencode(mbox);
+ var lock, url = '_mbox='+urlencode(mbox);
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
- lock = this.set_busy(true, 'loading');
- url += '&_reload=1';
- }
+ lock = this.set_busy(true, 'loading');
+ url += '&_reload=1';
+ if (this.env.search_request)
+ url += '&_search='+this.env.search_request;
+ }
// send request to server
this.http_post('expunge', url, lock);