try #2423 @1

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index f21e106748abe1bb63bbcab8f14af7722467b383..ef219dd1b352bc447d188767f36cf65773a69fd5 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -592,8 +592,6 @@ Fluidbook.prototype = {
     resetWaiters: function () {
         this.waiters = [];
     },
-
-
     physicalToVirtual: function (page) {
         return this.datas.numerotation[page - 1];
     },
@@ -954,7 +952,7 @@ Fluidbook.prototype = {
     pauseNetwork: function (during) {
         clearTimeout(this.networkPauseTimeout);
         var $this = this;
-        if (during == -1) {
+        if (during === -1) {
             this.networkPause = false;
             this.flushNetworkQueue();
             return;

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index fe05c6b9f9fefac140ee493c07844593abf40816..6f0ccec0e69045e2a4f2d530bf5b3c195147965f 100644 (file)
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -176,21 +176,26 @@ FluidbookLinks.prototype = {
             pageNr--;
         }
 
-        $("#links").removeClass('left').removeClass('right').addClass(lClass).html(this.fluidbook.datas.links[pageNr]).show();
+        var links = $("#links");
+
+        links.removeClass('left').removeClass('right').addClass(lClass).html(this.fluidbook.datas.links[pageNr]).show();
         if (this.fluidbook.datas.bookmark) {
-            $("#links").append(this.fluidbook.bookmarks.getBookmarkForPage(pageNr));
+            links.append(this.fluidbook.bookmarks.getBookmarkForPage(pageNr));
         }
 
-        $("#links").prepend('<div class="leftContainer"></div><div class="rightContainer"></div>');
-        $("#links").find('.rightContainer').append($("#links").children('.link.odd'));
-        $("#links").find('.leftContainer').append($("#links").children('.link'));
+        links.prepend('<div class="leftContainer"></div><div class="rightContainer"></div>');
+        links.find('.rightContainer').append(links.children('.link.odd'));
+        links.find('.leftContainer').append(links.children('.link'));
+        if (links.find('.link.multimedia iframe').length > 0) {
+            this.fluidbook.pauseNetwork(30000);
+        }
         if (this.lowdef) {
-            $("#links").find('iframe[data-ld]').each(function () {
+            links.find('iframe[data-ld]').each(function () {
                 $(this).attr('src', $(this).data('ld'));
             });
         }
 
-        $("#links").prepend('<div class="nonlinkarea"></div>');
+        links.prepend('<div class="nonlinkarea"></div>');
         var $this = this;
         if (this.fluidbook.datas.linkBlinkTime > 0 && this.fluidbook.datas.mobileLinksRevealAnim) {
             setTimeout(function () {
@@ -202,8 +207,8 @@ FluidbookLinks.prototype = {
             $this.initInlineSlideshows();
         }, 200);
 
-        $(fluidbook).trigger('fluidbook.links.ready');
 
+        $(fluidbook).trigger('fluidbook.links.ready');
         this.resize();
     },
 

diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 1d910e4ae6cb9c8f4cb8a18c2ca5aa7c6955fb82..f64162c017c8bfd526365c6b4865651303be828b 100644 (file)
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -105,7 +105,7 @@ FluidbookLoader.prototype = {
         var $this = this;
         var $_callback;
 
-        if (this.fluidbook.support.transitions3dacc) {
+        if (this.fluidbook.pagetransitions.flip3d !== false) {
             $_callback = function () {
                 $this.loadTexture(page, callback);
             };

diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js
index 93dbfacca438822db1c3289b5017a9ec1f3632d8..7bf3fe9aa997c952f3bff5d5ce30d0dbdc32b787 100644 (file)
--- a/js/libs/fluidbook/fluidbook.pagetransitions.js
+++ b/js/libs/fluidbook/fluidbook.pagetransitions.js
@@ -8,6 +8,8 @@ FluidbookPageTransition.prototype = {
     init: function () {
         if (this.fluidbook.support.transitions3dacc && this.fluidbook.datas.mobileTransitions === 'flip3d') {
             this.flip3d = new Fluidbook3DFlip(this.fluidbook);
+        } else {
+            this.flip3d = false;
         }
     },
 
@@ -41,7 +43,7 @@ FluidbookPageTransition.prototype = {
             return this.pageTransition2DPortrait(pageNr);
         }
 
-        if(!this.fluidbook.support.transitions3d && this.fluidbook.datas.mobileTransitions === 'flip'){
+        if (!this.fluidbook.support.transitions3d && this.fluidbook.datas.mobileTransitions === 'flip') {
             this.fluidbook.zoom.resetZoom();
             return this.pageTransition2D(pageNr);
         }

diff --git a/style/help.less b/style/help.less
index c46d0329e293813f2e74c95f17b9765a87e61e3b..e3965d22c79c57c423aeb8985c1d277e851d6439 100644 (file)
--- a/style/help.less
+++ b/style/help.less
@@ -79,7 +79,6 @@
                        margin-top: -1em;
                }
        }
-
 }
 
 #helpView .interface hr {