From: Vincent Vanwaelscappel Date: Wed, 9 Nov 2022 17:46:23 +0000 (+0100) Subject: wait #5535 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=380adbffa01472ec9f4b319de2217f6d985051e1;p=fluidbook-html5.git wait #5535 @1.5 --- diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js index 28e1ba13..be4942a5 100644 --- a/js/libs/fluidbook/fluidbook.menu.js +++ b/js/libs/fluidbook/fluidbook.menu.js @@ -927,7 +927,7 @@ FluidbookMenu.prototype = { nh = parseInt($(iframe).data('height')); w = Math.max(ww * 0.8); - h = Math.max(hh * 0.8); + h = Math.max(hh * 0.92); if (ww < 600) { w = ww; h = hh; diff --git a/js/libs/fluidbook/links/fluidbook.links.zoom.js b/js/libs/fluidbook/links/fluidbook.links.zoom.js index f40a4606..ed623207 100644 --- a/js/libs/fluidbook/links/fluidbook.links.zoom.js +++ b/js/libs/fluidbook/links/fluidbook.links.zoom.js @@ -213,7 +213,10 @@ FluidbookLinksZoom.prototype = { menu += ' href="#" data-cart-ref="' + $(zoomLink).data('ref') + '" '; } else if (action === 'image') { menu += ' href="#/multimedia/' + hash + '" '; - var markup = '
'; + if (data.substr(0, 1) !== '<') { + data = ''; + } + var markup = '
' + data + '
'; menu += ' data-multimedia="' + encodeURIComponent(markup) + '"' } else if (action === 'videofile') { menu += ' href="#/video/' + hash + '" ';