summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Churchill <damoxc@gmail.com>2011-10-05 02:31:51 +0100
committerDamien Churchill <damoxc@gmail.com>2011-10-05 02:31:51 +0100
commitd44a357284059bae02e585fef150869a1a9ca6bb (patch)
tree6a96df2372e27707433dd95f28c149c95e42a226
parentd6715fcbb9504ca0e8e1c81f215fc956e1760e52 (diff)
downloaddeluge-d44a357284059bae02e585fef150869a1a9ca6bb.tar.gz
deluge-d44a357284059bae02e585fef150869a1a9ca6bb.tar.bz2
deluge-d44a357284059bae02e585fef150869a1a9ca6bb.zip
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.
-rw-r--r--deluge/ui/web/js/deluge-all/FilterPanel.js2
-rw-r--r--deluge/ui/web/js/deluge-all/Sidebar.js4
2 files changed, 5 insertions, 1 deletions
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,