decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

don't output null, use empty string instead, fixes #3168

Browse source
This commit is contained in:
j 2018-09-25 10:34:35 +02:00
parent f93ece1ab7
commit 8a0098ec1f
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
static/js/list.js
View file

@ -145,7 +145,7 @@ pandora.ui.list = function() {
info.css({width: size * 0.75 + 'px'}); info.css({width: size * 0.75 + 'px'});
} }
} else { } else {
info = data[sortKey]; info = data[sortKey] || '';
} }
} }
size = size || 128; size = size || 128;
@ -192,7 +192,9 @@ pandora.ui.list = function() {
info = data['year'] || data['date'] || ''; info = data['year'] || data['date'] || '';
} else { } else {
format = pandora.getSortKeyData(sortKey).format; format = pandora.getSortKeyData(sortKey).format;
if (format) { if (Ox.isUndefined(data[sortKey]) || Ox.isNull(data[sortKey])) {
info = '';
} else if (format) {
info = ( info = (
/^color/.test(format.type.toLowerCase()) ? Ox.Theme : Ox /^color/.test(format.type.toLowerCase()) ? Ox.Theme : Ox
)['format' + Ox.toTitleCase(format.type)].apply( )['format' + Ox.toTitleCase(format.type)].apply(
@ -202,7 +204,7 @@ pandora.ui.list = function() {
info.css({width: size * 0.75 + 'px'}); info.css({width: size * 0.75 + 'px'});
} }
} else { } else {
info = data[sortKey]; info = data[sortKey] || '';
} }
} }
return { return {
@ -279,7 +281,9 @@ pandora.ui.list = function() {
info = data['year'] || data['date'] || ''; info = data['year'] || data['date'] || '';
} else { } else {
format = pandora.getSortKeyData(sortKey).format; format = pandora.getSortKeyData(sortKey).format;
if (format) { if (Ox.isUndefined(data[sortKey]) || Ox.isNull(data[sortKey])) {
info = '';
} else if (format) {
info = ( info = (
/^color/.test(format.type.toLowerCase()) ? Ox.Theme : Ox /^color/.test(format.type.toLowerCase()) ? Ox.Theme : Ox
)['format' + Ox.toTitleCase(format.type)].apply( )['format' + Ox.toTitleCase(format.type)].apply(
@ -289,7 +293,7 @@ pandora.ui.list = function() {
info.css({width: size * 0.75 + 'px'}); info.css({width: size * 0.75 + 'px'});
} }
} else { } else {
info = data[sortKey]; info = data[sortKey] || '';
} }
} }
return { return {