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

fix #1187 (missing formatNumber in filter item count column)

Browse source
This commit is contained in:
rolux 2012-12-23 03:33:20 +01:00
parent 3919db8ae1
commit 966c6954b3
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,7 @@ pandora.ui.filter = function(id) {
.addClass('flagname') .addClass('flagname')
.css({ .css({
float: 'left', float: 'left',
width: pandora.user.ui.filterSizes[i] - 64 - Ox.UI.SCROLLBAR_SIZE, width: pandora.user.ui.filterSizes[i] - 68 - Ox.UI.SCROLLBAR_SIZE,
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
overflowX: 'hidden' overflowX: 'hidden'
}) })
@ -46,15 +46,18 @@ pandora.ui.filter = function(id) {
operator: filter.type == 'string' ? '+' : '-', operator: filter.type == 'string' ? '+' : '-',
title: title, title: title,
visible: true, visible: true,
width: pandora.user.ui.filterSizes[i] - 40 - Ox.UI.SCROLLBAR_SIZE width: pandora.user.ui.filterSizes[i] - 44 - Ox.UI.SCROLLBAR_SIZE
}, },
{ {
align: 'right', align: 'right',
format: function(value) {
return Ox.formatNumber(value);
},
id: 'items', id: 'items',
operator: '-', operator: '-',
title: '#', title: '#',
visible: true, visible: true,
width: 40 width: 44
} }
], ],
columnsVisible: true, columnsVisible: true,

4
static/js/pandora/utils.js
View file

@ -1084,9 +1084,9 @@ pandora.resizeFilters = function(width) {
.size(0, pandora.user.ui.filterSizes[1]) .size(0, pandora.user.ui.filterSizes[1])
.size(2, pandora.user.ui.filterSizes[3]); .size(2, pandora.user.ui.filterSizes[3]);
pandora.$ui.filters.forEach(function($list, i) { pandora.$ui.filters.forEach(function($list, i) {
$list.resizeColumn('name', pandora.user.ui.filterSizes[i] - 40 - Ox.UI.SCROLLBAR_SIZE); $list.resizeColumn('name', pandora.user.ui.filterSizes[i] - 44 - Ox.UI.SCROLLBAR_SIZE);
if (pandora.user.ui.showFlags) { if (pandora.user.ui.showFlags) {
$list.find('.flagname').css({width: pandora.user.ui.filterSizes[i] - 64 - Ox.UI.SCROLLBAR_SIZE}) $list.find('.flagname').css({width: pandora.user.ui.filterSizes[i] - 68 - Ox.UI.SCROLLBAR_SIZE})
} }
}); });
}; };