From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 21 Sep 2018 13:04:55 +0000 (+0200)
Subject: wip #2217 @3
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5198f85ac5e37791f5a437b6f945960312206833;p=fluidbook-html5.git

wip #2217 @3
---

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index a731c24a..af74a7f2 100644
--- 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 9d48fbeb..95af14ef 100644
--- 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();