summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-11 20:28:34 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-11 20:29:22 +0200
commit04f841e90079464a9870a0a0a83b3ee2925a9adb (patch)
tree098bbebbddfd96536bea82a9500fd12097608381
parentacb4b71ce55f3d98f7053b7bb8fdcf3c7858fbfc (diff)
Fix list mode switch to 'List' after saving list settings in Larry skin (#1489164)
-rw-r--r--CHANGELOG1
-rw-r--r--skins/larry/ui.js5
2 files changed, 2 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 15b513464..a0d0a612a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix list mode switch to 'List' after saving list settings in Larry skin (#1489164)
- Fix error when there's no writeable addressbook source (#1489162)
- Fix zipdownload plugin issue with filenames charset (#1489156)
- Fix so non-inline images aren't skipped on forward (#1489150)
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 4485a21f8..93724dd4c 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -665,8 +665,6 @@ function rcube_mail_ui()
$('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
$('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
$('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
- $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false);
- $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true);
// set checkboxes
$('input[name="list_col[]"]').each(function() {
@@ -695,11 +693,10 @@ function rcube_mail_ui()
var sort = $('input[name="sort_col"]:checked').val(),
ord = $('input[name="sort_ord"]:checked').val(),
- thread = $('input[name="view"]:checked').val(),
cols = $('input[name="list_col[]"]:checked')
.map(function(){ return this.value; }).get();
- rcmail.set_list_options(cols, sort, ord, thread == 'thread' ? 1 : 0);
+ rcmail.set_list_options(cols, sort, ord, rcmail.env.threading);
}