Merge branch 'master' into talmdal_dev

1 files changed, 15 insertions, 15 deletions

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index a9aa6b2c..a8b237bf 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -151,24 +151,24 @@
     var width = size.width() - 6,
         height = size.height() - 6;
 
-      var ratio = width / imageWidth;
-      imageWidth *= ratio;
-      imageHeight *= ratio;
-
-      /* after scaling the width, check that the height fits */
-      if (imageHeight > height) {
-        ratio = height / imageHeight;
+    var ratio = width / imageWidth;
         imageWidth *= ratio;
         imageHeight *= ratio;
-      }
 
-      // handle the case where the calculation is almost zero (2.14e-14)
-      return {
-        top: Number((height - imageHeight) / 2),
-        left: Number((width - imageWidth) / 2),
-        width: Number(imageWidth),
-        height: Number(imageHeight)
-      };
+    /* after scaling the width, check that the height fits */
+    if (imageHeight > height) {
+      ratio = height / imageHeight;
+      imageWidth *= ratio;
+      imageHeight *= ratio;
+    }
+
+    // handle the case where the calculation is almost zero (2.14e-14)
+    return {
+      top: Number((height - imageHeight) / 2),
+      left: Number((width - imageWidth) / 2),
+      width: Number(imageWidth),
+      height: Number(imageHeight)
+    };
   };
 
   // Initialize a short form. Short forms may contain only one text input.