From 3dc3caf1377be6e331c265b8c36b8b11b18cf0c9 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Thu, 21 Mar 2013 12:46:00 +0100
Subject: [PATCH] Remove ratio = 1 as default

---
 templates/web/prod/actions/Tools/index.html.twig |  4 ++--
 www/prod/ThumbExtractor.js                       | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/templates/web/prod/actions/Tools/index.html.twig b/templates/web/prod/actions/Tools/index.html.twig
index 583f395bbb..2016ac3617 100644
--- a/templates/web/prod/actions/Tools/index.html.twig
+++ b/templates/web/prod/actions/Tools/index.html.twig
@@ -131,9 +131,9 @@
               {% set height = record.get_technical_infos(dataH) %}
 
               {% if width and height %}
-                {% set ratio = (width / height) %}
+                {% set ratio = width / height %}
               {% else %}
-                 {% set ratio = 1 %}
+                 {% set ratio = '' %}
               {% endif %}
 
               <video id="thumb_video" controls="" preload="auto" data-ratio="{{ ratio }}">
diff --git a/www/prod/ThumbExtractor.js b/www/prod/ThumbExtractor.js
index 18c3ff9d9f..c4bbd77c3b 100644
--- a/www/prod/ThumbExtractor.js
+++ b/www/prod/ThumbExtractor.js
@@ -13,14 +13,17 @@
       var w = elementDomNode.getWidth();
       var maxH = elementDomNode.getHeight();
 
-      var h = Math.round(w * (1 / elementDomNode.getAspectRatio()));
+      if ('' !== elementDomNode.getAspectRatio()) {
+        var h = Math.round(w * (1 / elementDomNode.getAspectRatio()));
 
-      if (h > maxH) {
+        if (h > maxH) {
+            var h = maxH;
+            var w =  Math.round(h * elementDomNode.getAspectRatio());
+        }
+      } else {
           var h = maxH;
-          var w =  Math.round(h * elementDomNode.getAspectRatio());
       }
 
-
       this.domCanva.setAttribute("width", w);
       this.domCanva.setAttribute("height", h);
 
@@ -102,7 +105,7 @@
 
   var Video = function(domElement){
     Image.call(this, domElement);
-    this.aspectRatio = domElement.getAttribute('data-ratio') || 1;
+    this.aspectRatio = domElement.getAttribute('data-ratio');
   };
 
   Video.prototype = new Image();