summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-03-03 13:12:52 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-03-03 13:12:52 +0000
commit07e9319fd0eaf1fa22f745e48ac044418bc2b575 (patch)
treedd303f7cf1e4fc42d08d735a6c9a769bab4dcfe9 /roundcubemail/program
parented4471339a3016ba0fc508db9612750218e10103 (diff)
- Prevent from folder selection on virtual folder collapsing (#1488346)
git-svn-id: https://svn.roundcube.net/trunk@5951 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/js/app.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 79ba528a6..ca73db57c 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -1444,8 +1444,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