wait #5535 @1.5

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 28e1ba1372ad05e42d2ff77f6b58e241923a3573..be4942a53473c5cfc16c9a96658423b328241c33 100644 (file)
--- 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 f40a46068b20e4edf6d2d016cc696eb76e4b8840..ed6232076c40b4cb3fbe46bdd107caedd57a4e30 100644 (file)
--- 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 = '<div class="multimediaContainer "><img src="' + data + '" class="multimedia" /></div>';
+                            if (data.substr(0, 1) !== '<') {
+                                data = '<img src="' + data + '" className="multimedia"/>';
+                            }
+                            var markup = '<div class="multimediaContainer ">' + data + '</div>';
                             menu += ' data-multimedia="' + encodeURIComponent(markup) + '"'
                         } else if (action === 'videofile') {
                             menu += ' href="#/video/' + hash + '" ';