ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed "original width" fit on Webkit

Browse source
This commit is contained in:
rr- 2015-07-29 19:39:10 +02:00
parent b4db90bcdc
commit 5a537ba168
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
public_html/js/Presenters/PostContentPresenter.js
View file

@ -55,24 +55,26 @@ App.Presenters.PostContentPresenter = function(
height = originalHeight;
}
}
$wrapper.css({maxWidth: width + 'px', width: ''});
$wrapper.css({maxWidth: width + 'px'});
},
'fit-height': function(allowUpscale) {
var width = containerHeight * ratio;
if (width > originalWidth && !allowUpscale) {
width = originalWidth;
}
$wrapper.css({maxWidth: width + 'px', width: ''});
$wrapper.css({maxWidth: width + 'px'});
},
'fit-width': function(allowUpscale) {
if (allowUpscale) {
$wrapper.css({maxWidth: containerWidth + 'px', width: ''});
$wrapper.css({maxWidth: containerWidth + 'px'});
} else {
$wrapper.css({maxWidth: originalWidth + 'px', width: ''});
$wrapper.css({maxWidth: originalWidth + 'px'});
}
},
'original': function(allowUpscale) {
$wrapper.css({maxWidth: '', width: originalWidth + 'px'});
$wrapper.css({
minWidth: originalWidth + 'px',
width: originalWidth + 'px'});
}
};
}
@ -83,6 +85,11 @@ App.Presenters.PostContentPresenter = function(
function changeFitMode(fitMode) {
$wrapper.data('fit-mode', fitMode);
$wrapper.css({
width: '', height: '',
minWidth: '', minHeight: '',
maxWidth: '', maxHeight: '',
});
getFitters()[fitMode.style](fitMode.upscale);
updatePostNotesSize();
}