fix preview in 'always show site poster' mode

This commit is contained in:
rolux 2013-07-17 14:12:05 +00:00
parent d45173b0da
commit 069cfc155d
2 changed files with 3 additions and 4 deletions

View file

@ -465,7 +465,7 @@ pandora.ui.list = function() {
) + ( ) + (
item.year ? ' ' + item.year : '' item.year ? ' ' + item.year : ''
), ),
ratio = ui.showSitePosters ? pandora.site.posters.ratio : item.posterRatio, ratio = pandora.user.ui.showSitePosters ? pandora.site.posters.ratio : item.posterRatio,
windowWidth = window.innerWidth * 0.8, windowWidth = window.innerWidth * 0.8,
windowHeight = window.innerHeight * 0.8, windowHeight = window.innerHeight * 0.8,
windowRatio = windowWidth / windowHeight, windowRatio = windowWidth / windowHeight,
@ -473,14 +473,14 @@ pandora.ui.list = function() {
height = Math.round(ratio < windowRatio ? windowHeight : windowWidth / ratio); height = Math.round(ratio < windowRatio ? windowHeight : windowWidth / ratio);
pandora.$ui.previewImage = $('<img>') pandora.$ui.previewImage = $('<img>')
.attr({src: '/' + item.id + '/' + ( .attr({src: '/' + item.id + '/' + (
ui.showSitePosters ? 'siteposter' : 'poster' pandora.user.ui.showSitePosters ? 'siteposter' : 'poster'
) + '128.jpg'}) ) + '128.jpg'})
.css({width: width + 'px', height: height + 'px'}) .css({width: width + 'px', height: height + 'px'})
$('<img>').load(function() { $('<img>').load(function() {
pandora.$ui.previewImage.attr({src: $(this).attr('src')}); pandora.$ui.previewImage.attr({src: $(this).attr('src')});
}) })
.attr({src: '/' + item.id + '/' + ( .attr({src: '/' + item.id + '/' + (
ui.showSitePosters ? 'siteposter' : 'poster' pandora.user.ui.showSitePosters ? 'siteposter' : 'poster'
) + '1024.jpg'}); ) + '1024.jpg'});
if (!preview) { if (!preview) {
if (!pandora.$ui.previewDialog) { if (!pandora.$ui.previewDialog) {

View file

@ -1806,7 +1806,6 @@ pandora.wait = function(taskId, callback, timeout) {
return task; return task;
}; };
(function() { (function() {
// Note: getFindState has to run after getListState and getFilterState // Note: getFindState has to run after getListState and getFilterState