From 9385126eeeeb2cc253cff454500f2401b2b4f6da Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 5 Sep 2018 17:26:54 +0200 Subject: [PATCH] #2215 --- js/libs/fluidbook/fluidbook.menu.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js index 377dd3d0..b7eca1e4 100644 --- a/js/libs/fluidbook/fluidbook.menu.js +++ b/js/libs/fluidbook/fluidbook.menu.js @@ -640,8 +640,11 @@ FluidbookMenu.prototype = { y = 0; } else { forceHeight = true; - - s = Math.min(2, w / nw, h / nh); + var ms = parseFloat(m.find('iframe').data('scale')); + if (isNaN(ms)) { + ms = 2; + } + s = Math.min(ms, w / nw, h / nh); if (iframe.is('img') || fullscreen) { s = Math.min(1, s); } @@ -676,10 +679,6 @@ FluidbookMenu.prototype = { }); } - m.find('.multimediaScale').css({width: nw, height: nh, overflow: 'hidden'}).transform({ - scale: [s, s], - origin: [0, 0] - }).css('text-align', 'left'); m.find('.multimediaScale').css({width: nw, height: nh, overflow: 'hidden'}).transform({ scale: [s, s], origin: [0, 0] -- 2.39.5