wip #2217 @3

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index a731c24ab143ce02b424156bb1ed780584e38c96..af74a7f224ae0ff2ce40d6f952549caeca50591f 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -179,11 +179,11 @@ Fluidbook.prototype = {
             navigator.splashscreen.hide();
         } catch (err) {
         }
-
+        $(this).trigger('fluidbook.splash.beforehide');
         var $this = this;
         setTimeout(function () {
             $this._hideSplash();
-        }, 300);
+        }, 1000);
     },
     _hideSplash: function () {
         $("#main,#viewOverlay,#view").css('visibility', 'visible');

diff --git a/js/libs/scorm/scorm.js b/js/libs/scorm/scorm.js
index 9d48fbeb487b0821bc43b1f43e7effa3f55bc5ab..95af14efa9a8f229f383cd8cf150a61bfc19f8fa 100644 (file)
--- a/js/libs/scorm/scorm.js
+++ b/js/libs/scorm/scorm.js
@@ -89,16 +89,18 @@ function initScormEvents() {
         } catch (err) {
             console.log(err);
         }
-    });
 
-    $(fluidbook).on('fluidbook.page.navigation', function (e, page) {
-        scormSaveCurrentPosition(page);
-    });
+        $(fluidbook).on('fluidbook.page.navigation', function (e, page) {
+            scormSaveCurrentPosition(page);
+        });
 
-    $(fluidbook).on('fluidbook.maxpage.set', function (e, page) {
-        scormSaveCurrentPosition(undefined, page);
+        $(fluidbook).on('fluidbook.maxpage.set', function (e, page) {
+            scormSaveCurrentPosition(undefined, page);
+        });
     });
 
+
+
     // Commit data once a minute
     setInterval(function () {
         pipwerks.SCORM.save();