hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aspect ratio corrective

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-03-22 14:43:44 +01:00
committed by Romain Neutron
parent 128f69e314
commit e57bf3186e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -131,7 +131,7 @@
{% set height = record.get_technical_infos(dataH) %} {% set height = record.get_technical_infos(dataH) %}
{% if width and height %} {% if width and height %}
{% set ratio = width / height %} {% set ratio = (width / height)|number_format(2, '.') %}
{% else %} {% else %}
{% set ratio = '' %} {% set ratio = '' %}
{% endif %} {% endif %}

6
www/prod/ThumbExtractor.js
View File

@@ -14,11 +14,13 @@
var maxH = elementDomNode.getHeight(); var maxH = elementDomNode.getHeight();
if ('' !== elementDomNode.getAspectRatio()) { if ('' !== elementDomNode.getAspectRatio()) {
var h = Math.round(w * (1 / elementDomNode.getAspectRatio())); var ratio = parseFloat(elementDomNode.getAspectRatio());
var h = Math.round(w * (1 / ratio));
if (h > maxH) { if (h > maxH) {
var h = maxH; var h = maxH;
var w = Math.round(h * elementDomNode.getAspectRatio()); var w = Math.round(h * ratio);
} }
} else { } else {
var h = maxH; var h = maxH;