wait #3231 @1

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index b350c8f383f2935743aad917d8528723c8c4e116..32e75423b91d88d63a2531097ba2c05c7cde79fe 100644 (file)
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -568,5 +568,21 @@ FluidbookLinks.prototype = {
     rolloverLeave: function (iid) {
         var e = $('[data-id="' + iid + '"]');
         e.removeClass('animaterollover');
+    },
+    resizeIframe: function (height) {
+        var iframe = $('.link iframe').eq(0);
+        var container = iframe.closest('.content');
+        var iframeHeight = parseFloat(iframe.data('height'));
+        var height = Math.max(height, iframeHeight);
+        var containerHeight = parseFloat(container.data('height'));
+        if (containerHeight === 0 || isNaN(containerHeight)) {
+            containerHeight = iframeHeight;
+        }
+        iframe.attr('height', height);
+        iframe.closest('.multimediaScale').css('height',height);
+        container.css({maxHeight: Math.min(iframeHeight, containerHeight)});
+        if (!Modernizr.ftouch) {
+            container.perfectScrollbar('update');
+        }
     }
 }

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 45b39c923dec32d1844c19d33f9fbbad87136ad6..7613faf024dd0968dff1ed608394d0645e907567 100644 (file)
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -953,7 +953,7 @@ FluidbookMenu.prototype = {
             ccss.minHeight = ccss.height = css.minHeight = css.height = '';
         }
         m.css(css);
-        m.find(".content").css(ccss);
+        m.find(".content").css(ccss).attr('data-height', ccss.height);
         if (!fullscreen) {
             m.css({top: (hh - m.outerHeight()) / 2, left: (ww - m.outerWidth()) / 2});
         }