diff options
| author | Aleksander Machniak <alec@alec.pl> | 2015-03-02 13:51:51 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2015-03-02 13:51:51 +0100 |
| commit | 9ad0fc489ff3c32face845989a8f5f311208b4f9 (patch) | |
| tree | 74c81541b95a22bdf2eb9d5a7a563d12f4198731 /program | |
| parent | 7981575a616b4486531562bfd5fe727de7ab8d6a (diff) | |
Fix javascript error after creating a folder which is a subfolder of another one (#1490297)
Diffstat (limited to 'program')
| -rw-r--r-- | program/js/app.js | 6 | ||||
| -rw-r--r-- | program/steps/settings/folders.inc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/program/js/app.js b/program/js/app.js index 56d07f37e..7d3f0c55d 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1608,7 +1608,8 @@ function rcube_webmail() this.folder_collapsed = function(node) { - var prefname = this.env.task == 'addressbook' ? 'collapsed_abooks' : 'collapsed_folders'; + var prefname = this.env.task == 'addressbook' ? 'collapsed_abooks' : 'collapsed_folders', + old = this.env[prefname]; if (node.collapsed) { this.env[prefname] = this.env[prefname] + '&'+urlencode(node.id)+'&'; @@ -1624,7 +1625,8 @@ function rcube_webmail() } if (!this.drag_active) { - this.command('save-pref', { name: prefname, value: this.env[prefname] }); + if (old !== this.env[prefname]) + this.command('save-pref', { name: prefname, value: this.env[prefname] }); if (this.env.unread_counts) this.set_unread_count_display(node.id, false); diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index 6db0b17e8..443635fae 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -265,7 +265,7 @@ function rcmail_subscription_form($attrib) $js_folders = array(); $folders = array(); - $collapsed = $RCMAIL->config->get('collapsed_folders'); + $collapsed = (string) $RCMAIL->config->get('collapsed_folders'); // create list of available folders foreach ($list_folders as $i => $folder) { |