wip #2649 @1

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 9978b1ddb87b36a409627c68e8d9ead0d2ad9365..c0455908f9227be61523370aa443ceab80a612af 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -1095,33 +1095,21 @@ Fluidbook.prototype = {
 
         var date = Date.now() + during + 500;
         if (this.networkPauseDate == null || reset) {
-            try {
-                throw new Error('reset pause ' + during);
-            } catch (e) {
-                console.log(e);
-            }
-
             this.networkPauseDate = date;
         } else {
-            try {
-                throw new Error('pause ' + during);
-            } catch (e) {
-                console.log(e);
-            }
-
             this.networkPauseDate = Math.max(this.networkPauseDate, date);
         }
     },
 
-    executeWhenNetwork: function (f, highPriority) {
+    executeWhenNetwork: function (f,highPriority) {
         if (highPriority === undefined) {
             highPriority = false;
         }
         if (this.networkPauseDate != null) {
             if (highPriority) {
-                this.networkPausePriorityQueue.push(f);
+                this.networkPausePriorityQueue.push([f]);
             } else {
-                this.networkPauseQueue.push(f);
+                this.networkPauseQueue.push([f]);
             }
             return;
         }

diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 2a99ca1a5c01205fea26d457465fcb335328e0e2..72b94c589036a4aa8274fc4c1b67828448438bba 100644 (file)
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -40,8 +40,27 @@ FluidbookLoader.prototype = {
     },
 
     preloadPagesBeforeTransition: function (pages, callback) {
+        var preloadedOk = false;
         this.transitionPages = pages.slice(0);
-        this._preloadPagesBeforeTransition(pages, callback);
+        var $this = this;
+        var timeout;
+        var _cb = function () {
+            clearTimeout(timeout);
+            if (preloadedOk === true) {
+                return;
+            }
+            preloadedOk = true;
+            callback();
+        };
+
+        timeout = setTimeout(function () {
+            if (preloadedOk === true) {
+                return;
+            }
+            this.fluidbook.displayLoader();
+            $this._preloadPagesBeforeTransition(pages, _cb);
+        }, 7000);
+        this._preloadPagesBeforeTransition(pages, _cb);
     },
 
     _preloadPagesBeforeTransition: function (pages, callback) {
@@ -51,6 +70,7 @@ FluidbookLoader.prototype = {
             return;
         }
 
+
         var $this = this;
         var $pages = pages.slice(0);
         if ($pages.length == 0) {
@@ -59,7 +79,6 @@ FluidbookLoader.prototype = {
             return;
         }
 
-
         var $callback = callback;
         var $page = $pages.shift();
 
@@ -171,7 +190,6 @@ FluidbookLoader.prototype = {
             }
         }
         this.preloaded = this.toPreload.slice(0);
-        //this.cleanPreloaded();
         this.preloadPages();
     },