From 1837d833c245afcb57da411ba4f37b99fcdbf03a Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Mon, 21 Nov 2011 23:05:02 +0000 Subject: web: few sidebar fixes --- deluge/ui/web/js/deluge-all/FilterPanel.js | 4 +++- deluge/ui/web/js/deluge-all/Sidebar.js | 10 +++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/deluge/ui/web/js/deluge-all/FilterPanel.js b/deluge/ui/web/js/deluge-all/FilterPanel.js index c51b99f34..f3a3e11f3 100644 --- a/deluge/ui/web/js/deluge-all/FilterPanel.js +++ b/deluge/ui/web/js/deluge-all/FilterPanel.js @@ -174,7 +174,9 @@ Ext.define('Deluge.FilterPanel', { if (filters[record.getId()]) return; var r = sm.getLastSelected(); store.remove(record); - if (r.id == record.id) { + if (r === undefined) + return; + if (r.getId() == record.getId()) { sm.select(0); } }, this); diff --git a/deluge/ui/web/js/deluge-all/Sidebar.js b/deluge/ui/web/js/deluge-all/Sidebar.js index fa2e376aa..42503bf95 100644 --- a/deluge/ui/web/js/deluge-all/Sidebar.js +++ b/deluge/ui/web/js/deluge-all/Sidebar.js @@ -90,13 +90,9 @@ Ext.define('Deluge.Sidebar', { deluge.ui.update(); } - Ext.defer(function() { - panel.doLayout(); - }, 100); - console.log('switching'); - //if (!sm.hasSelection() && s.count() > 0) { - // sm.select([s.first()]); - //} + if (!sm.hasSelection() && s.count() > 0) { + sm.select([s.first()]); + } }); this.fireEvent('filtercreate', this, panel); -- cgit