From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 28 Jun 2017 15:40:40 +0000 (+0200)
Subject: done #1503 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=545f29933987890113db309959d7766508a2d00d;p=fluidbook-html5.git

done #1503 @1
---

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 1b04a0de..7c05a434 100644
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -530,35 +530,44 @@ FluidbookMenu.prototype = {
                 if (readmode) {
                     w = Math.max(w * 0.5, nw);
                     forceHeight = false;
+
                     if (w > ww * 0.9) {
                         fullscreen = true;
                         w = ww;
                         h = hh;
+                        s = ww / nw;
+
+                    } else {
+                        s = w / nw;
+
                     }
+                    x = 0;
+                    y = 0;
                 } else {
                     forceHeight = true;
 
                     s = Math.min(w / nw, h / nh);
-                    if (iframe.is('img')) {
+                    if (iframe.is('img') || fullscreen) {
                         s = Math.min(1, s);
                     }
                     if (!fullscreen) {
                         w = nw * s;
                         h = nh * s;
                     }
-                    x = ( w - (nw * s)  ) / 2;
-                    y = (h - (nh * s)) / 2;
 
-                    if (s < 1) {
-                        var css = {overflow: 'hidden', width: nw * s, height: nh * s};
-                        m.find('.multimediaHolder').css(css);
-                    } else {
-                        m.find('.multimediaHolder').css({width: '', height: ''});
-                    }
+                    x = (w - (nw * s)  ) / 2;
+                    y = (h - (nh * s)) / 2;
                 }
 
 
-                m.find('.multimediaScale').css({width: nw, height: nh, overflow: 'hidden'}).transform({translateX: x + 'px', translateY: y + 'px', scale: [s, s], origin: [0, 0]}).css('text-align', 'left');
+                if (s < 1) {
+                    var css = {overflow: 'hidden', width: nw * s, height: nh * s, top: y, left: x, position: 'absolute'};
+                    m.find('.multimediaHolder').css(css);
+                } else {
+                    m.find('.multimediaHolder').css({position: "", overflow: '', width: '', height: '', top: '', left: ''});
+                }
+
+                m.find('.multimediaScale').css({width: nw, height: nh, overflow: 'hidden'}).transform({scale: [s, s], origin: [0, 0]}).css('text-align', 'left');
                 break;
             default:
                 break;