From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 11 Jan 2019 16:02:57 +0000 (+0100)
Subject: wait #2497 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c5ae78808064b39f85eae158876f86534960b1a9;p=fluidbook-html5.git

wait #2497 @0.5
---

diff --git a/js/libs/scorm/scorm.js b/js/libs/scorm/scorm.js
index 031b4084..a76cb80d 100644
--- a/js/libs/scorm/scorm.js
+++ b/js/libs/scorm/scorm.js
@@ -71,6 +71,9 @@ function initScormEvents() {
     SCORM_EVENTS_INITED = true;
 
     $(window).on('unload', function () {
+        if (fluidbook.datas.scorm_complete_on_exit) {
+            scormMarkAsComplete();
+        }
         finishScorm();
     });
 
@@ -105,7 +108,8 @@ function initScormEvents() {
         });
     });
 
-    $(fluidbook).on('fluidbook.maxpage.set', function (e, page) {        scormSaveCurrentPosition(undefined, page);
+    $(fluidbook).on('fluidbook.maxpage.set', function (e, page) {
+        scormSaveCurrentPosition(undefined, page);
     });
 
 
@@ -133,16 +137,20 @@ function finishScorm() {
     pipwerks.SCORM.quit();
 }
 
-function startScormTimer() {
-    SCORM_START_TIME = new Date();
-}
-
-function scormComplete() {
+function scormMarkAsComplete() {
     setScormValue('exit', 'suspend');
     setScormValue('status', "completed");
     if (!fluidbook.scorm.manageScore) {
         setScormValue('success_status', 'passed');
     }
+}
+
+function startScormTimer() {
+    SCORM_START_TIME = new Date();
+}
+
+function scormComplete() {
+    scormMarkAsComplete();
     finishScorm();
     setTimeout(function () {
         parent.close();