From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 28 Jun 2017 14:55:08 +0000 (+0200)
Subject: done #1510 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2ad89f85008c3c5b5b474cab590d766e4628d739;p=fluidbook-html5.git

done #1510 @0.5
---

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 = '<div class="caption">' + this.closeButton() + '</div>';
-        view += '<div class="content"><div class="multimediaScale">';
+        view += '<div class="content"><div class="multimediaHolder"><div class="multimediaScale">';
         view += markup;
-        view += '</div></div>';
+        view += '</div></div></div>';
 
         var read = multimedia.indexOf('r_') == 0 ? ' data-readmode="1"' : '';
         $("#view").append('<div class="mview" dir="ltr" data-menu="multimedia"' + read + '>' + view + '</div>');
@@ -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');
             }