From 2ad89f85008c3c5b5b474cab590d766e4628d739 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 28 Jun 2017 16:55:08 +0200 Subject: [PATCH] done #1510 @0.5 --- js/libs/fluidbook/fluidbook.menu.js | 12 ++++++++++-- js/libs/fluidbook/fluidbook.nav.js | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js index 6fa92c42..1b04a0de 100644 --- a/js/libs/fluidbook/fluidbook.menu.js +++ b/js/libs/fluidbook/fluidbook.menu.js @@ -182,9 +182,9 @@ FluidbookMenu.prototype = { var a = $('a[href="#/multimedia/' + multimedia + '"]'); var markup = decodeURIComponent($(a).attr('data-multimedia')); var view = '
' + this.closeButton() + '
'; - view += '
'; + view += '
'; view += markup; - view += '
'; + view += '
'; var read = multimedia.indexOf('r_') == 0 ? ' data-readmode="1"' : ''; $("#view").append('
' + view + '
'); @@ -548,8 +548,16 @@ FluidbookMenu.prototype = { } 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: ''}); + } } + 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'); break; default: diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js index cbba0fbc..1792d367 100644 --- a/js/libs/fluidbook/fluidbook.nav.js +++ b/js/libs/fluidbook/fluidbook.nav.js @@ -195,8 +195,6 @@ FluidbookNav.prototype = { }) } - console.log(link); - console.log(visible); if (!visible) { $(link).addClass('hidden'); } -- 2.39.5