wait #4088 @0:10

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index 40245e9ac1df716bcf8aaf3ac661e77af6a88207..e95de568f7fc6fce93cca26fe44822248d422d8f 100644 (file)
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -741,7 +741,9 @@ FluidbookLinks.prototype = {
 
     initInlineSlideshows: function () {
         var $this = this;
-        this.fluidbook.slideshow.clear();
+        if (this.fluidbook.slideshow) {
+            this.fluidbook.slideshow.clear();
+        }
         $(".inlineslideshow").each(function () {
             if ($(this).is(':visible')) {
                 $this.fluidbook.slideshow.initInlineSlideshow($(this));

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 214dc6345dacb9b799b8faf37aeb5a1a9d0ee9bc..618a1a2ea3c9879c4babaa6e47f7e98b2a6779d4 100644 (file)
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -647,6 +647,7 @@ FluidbookMenu.prototype = {
         var w = ww * 0.6;
         var h = hh * 0.8;
         var forceHeight = false;
+        var contentHeight = null;
         var fullscreen = m.data('fullscreen') === '1';
         var nw, nh;
 
@@ -829,6 +830,7 @@ FluidbookMenu.prototype = {
                     //m.find('.videoContainer').css({paddingLeft: (w - nw * s) / 2, paddingTop: (h - nh * s) / 2});
                 }
                 m.find('.videoContainer').css({width: w, height: h});
+                contentHeight = h;
 
                 break;
             case 'multimedia':
@@ -981,7 +983,7 @@ FluidbookMenu.prototype = {
 
         if (forceHeight) {
             css.minHeight = css.height = h;
-            if (contentHeight === undefined) {
+            if (contentHeight === null) {
                 ccss.minHeight = ccss.height = h - captionHeight;
 
                 // if (m.find('.fonctions').length > 0) {