From dd0edb7a3b28d1a5087dd670b8fd08c3241fb27a Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 14 Jan 2019 18:23:33 +0100 Subject: [PATCH] wait #2506 @2 --- js/libs/fluidbook/fluidbook.menu.js | 16 ++++++++++------ js/libs/fluidbook/fluidbook.utils.js | 9 +++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js index 76c8b866..c85bdd1c 100644 --- a/js/libs/fluidbook/fluidbook.menu.js +++ b/js/libs/fluidbook/fluidbook.menu.js @@ -197,14 +197,13 @@ FluidbookMenu.prototype = { var t = $("#view .iframeContainer").data('type'); $("#view").find('.iframeHolder,.content,.mview').attr('data-type', t); - + $("#view .iframeContainer iframe").on('load', function () { try { - var cw = $(this).get(0).contentWindow; - cw.document.style.maxWidth = '100%'; - cw.document.style.overflow = 'auto'; - }catch (e) { - + var doc = getIframeDocument(this); + doc.body.style.maxWidth = '100%'; + doc.body.style.overflow = 'auto'; + } catch (e) { } $this.resize(); }); @@ -639,6 +638,11 @@ FluidbookMenu.prototype = { var iframe = $("#view .iframeHolder iframe"); iframe.css('width', w); + try { + var doc = getIframeDocument(iframe); + doc.body.style.maxWidth = w + 'px'; + } catch (e) { + } if (!fullscreen) { var ih = -1; try { diff --git a/js/libs/fluidbook/fluidbook.utils.js b/js/libs/fluidbook/fluidbook.utils.js index 8c1a89f5..0af98162 100644 --- a/js/libs/fluidbook/fluidbook.utils.js +++ b/js/libs/fluidbook/fluidbook.utils.js @@ -100,3 +100,12 @@ function array_diff(a, b) { return b.indexOf(i) < 0; }); } + +function getIframeDocument(iframe){ + iframe = $(iframe).get(0); + var doc = iframe.contentWindow || iframe.contentDocument; + if (doc.document) { + doc = doc.document; + } + return doc; +} \ No newline at end of file -- 2.39.5