0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

don't make filter requests (a total of 15) when filters are collapsed

Browse source
This commit is contained in:
rolux 2012-04-22 12:50:03 +00:00
parent 778c98625a
commit ad7b21fbef
3 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
static/js/pandora/browser.js
View file

@ -39,6 +39,13 @@ pandora.ui.browser = function() {
toggle: function(data) {
data.collapsed && pandora.$ui.list.gainFocus();
pandora.UI.set({showFilters: !data.collapsed});
if (!data.collapsed) {
pandora.$ui.filters.forEach(function($filter) {
if ($filter.options('_reload')) {
$filter.options({_reload: false}).reloadList();
}
});
}
if (pandora.user.ui.listView == 'map') {
pandora.$ui.map.resizeMap();
} else if (pandora.user.ui.listView == 'calendar') {

9
static/js/pandora/filter.js
View file

@ -7,6 +7,7 @@ pandora.ui.filter = function(id) {
title = Ox.getObjectById(pandora.site.filters, id).title,
//width = pandora.getFilterWidth(i, panelWidth),
that = Ox.TextList({
_reload: !pandora.user.ui.showFilters,
columns: [
{
align: 'left',
@ -58,15 +59,15 @@ pandora.ui.filter = function(id) {
columnsVisible: true,
id: 'filter_' + id,
items: function(data, callback) {
//if (pandora.user.ui.showFilters) {
if (pandora.user.ui.showFilters) {
delete data.keys;
return pandora.api.find(Ox.extend(data, {
group: id,
query: pandora.user.ui._filterState[i].find
}), callback);
//} else {
// callback({data: {items: data.keys ? [] : 0}});
//}
} else {
callback({data: {items: data.keys ? [] : 0}});
}
},
scrollbarVisible: true,
selected: pandora.user.ui._filterState[i].selected,

17
static/js/pandora/mainPanel.js
View file

@ -36,13 +36,20 @@ pandora.ui.mainPanel = function() {
// FIXME: why is this being handled _here_?
pandora.user.ui._filterState.forEach(function(data, i) {
if (!Ox.isEqual(data.selected, previousUI._filterState[i].selected)) {
pandora.$ui.filters[i].options({selected: data.selected});
if (pandora.user.ui.showFilters) {
pandora.$ui.filters[i].options({selected: data.selected});
} else {
pandora.$ui.filters[i].options({_reload: true, selected: []});
}
}
if (!Ox.isEqual(data.find, previousUI._filterState[i].find)) {
Ox.Log('FIND', 'NOT EQUAL', data.find, previousUI._filterState[i].find)
pandora.$ui.filters[i].reloadList();
} else {
Ox.Log('FIND', 'EQUAL', data.find, previousUI._filterState[i].find)
if (pandora.user.ui.showFilters) {
pandora.$ui.filters[i].reloadList();
} else {
// we can call reloadList here, since the items function
// handles the hidden filters case without making requests
pandora.$ui.filters[i].options({_reload: true}).reloadList();
}
}
});
} else {