From d44a357284059bae02e585fef150869a1a9ca6bb Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Wed, 5 Oct 2011 02:31:51 +0100 Subject: [PATCH] web: fix the sidebar and filterpanels The filters in the sidebar can now be switch between finally. It was down to the setTitle method overwriting whatever the accordion layout was adding in. --- deluge/ui/web/js/deluge-all/FilterPanel.js | 2 +- deluge/ui/web/js/deluge-all/Sidebar.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/deluge/ui/web/js/deluge-all/FilterPanel.js b/deluge/ui/web/js/deluge-all/FilterPanel.js index 13866a61e..58b9d3428 100644 --- a/deluge/ui/web/js/deluge-all/FilterPanel.js +++ b/deluge/ui/web/js/deluge-all/FilterPanel.js @@ -53,7 +53,7 @@ Ext.define('Deluge.FilterPanel', { fl = p.substring(0, 1).toUpperCase(); title += fl + p.substring(1) + ' '; }); - this.setTitle(_(title)); + this.title = _(title); if (Deluge.FilterPanel.templates[this.filterType]) { var tpl = Deluge.FilterPanel.templates[this.filterType]; diff --git a/deluge/ui/web/js/deluge-all/Sidebar.js b/deluge/ui/web/js/deluge-all/Sidebar.js index 6f7c0960d..6a0309e0b 100644 --- a/deluge/ui/web/js/deluge-all/Sidebar.js +++ b/deluge/ui/web/js/deluge-all/Sidebar.js @@ -47,6 +47,10 @@ Ext.define('Deluge.Sidebar', { cls: 'deluge-sidebar', title: _('Filters'), layout: 'accordion', + layoutCfg: { + multi: true, + collapseFirst: true + }, split: true, width: 200, minSize: 175,