jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4104 from MayhemYDG/patch-1

Browse Source 
Add video support to resize_image_to_window
This commit is contained in:
Albert Yi
2019-07-25 15:23:02 -07:00
committed by GitHub
parent 716076437e 2d25519e18
commit 3c0c0006ba
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/src/javascripts/posts.js.erb
View File

@@ -370,10 +370,13 @@ Post.resize_image_to_window = function($img) {
} }
if ($img.width() > client_width) { if ($img.width() > client_width) {
var ratio = client_width / $img.data("original-width"); var isVideo = $img.prop("tagName") === "VIDEO";
var width = isVideo ? $img.prop("width") : $img.data("original-width");
var height = isVideo ? $img.prop("height") : $img.data("original-height");
var ratio = client_width / width;
$img.data("scale-factor", ratio); $img.data("scale-factor", ratio);
$img.css("width", $img.data("original-width") * ratio); $img.css("width", width * ratio);
$img.css("height", $img.data("original-height") * ratio); $img.css("height", height * ratio);
Post.resize_ugoira_controls(); Post.resize_ugoira_controls();
} }
} else { } else {