summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-03-03 13:20:14 +0000
committeralecpl <alec@alec.pl>2012-03-03 13:20:14 +0000
commit4ffa559227a2abecc12f8402b6ef99a06dfa4806 (patch)
treebbd74b108c557faadfc7ff7e43395ab8454949d9 /program/js
parent0411ae5a29632e9f157071afa7acdda48e8de20b (diff)
- Apply fixes from trunk
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 58d7f1e86..f83025dfb 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1407,8 +1407,9 @@ function rcube_webmail()
div.removeClass('expanded').addClass('collapsed');
this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(name)+'&';
- // select parent folder if one of its childs is currently selected
- if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0)
+ // select the folder if one of its childs is currently selected
+ // don't select if it's virtual (#1488346)
+ if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0 && !$(li).hasClass('virtual'))
this.command('list', name);
}
else