wait #4401 @0.25

diff --git a/js/libs/scorm/scorm.js b/js/libs/scorm/scorm.js
index 465175d4ab2595e4b422fe6b598dc66997b7942b..3edeb7c2294f25e2cc27175e768209d20d88318d 100644 (file)
--- a/js/libs/scorm/scorm.js
+++ b/js/libs/scorm/scorm.js
@@ -130,12 +130,7 @@ function initScormEvents() {
 
 
     $(fluidbook).on('fluidbook.page.navigation', function (e, page) {
-        fluidbook.networkControl.executeWhenNetwork(function (cb) {
-            scormSaveCurrentPosition(page);
-            if (cb !== undefined) {
-                setTimeout(cb, 100);
-            }
-        }, true);
+        scormSaveCurrentPosition(page);
     });
 
     $(fluidbook).on('fluidbook.maxpage.set', function (e, page) {
@@ -144,14 +139,16 @@ function initScormEvents() {
 
 
     // Commit data every 5 seconds
-    setInterval(function () {
-        fluidbook.networkControl.executeWhenNetwork(function (cb) {
-            pipwerks.SCORM.save();
-            if (cb !== undefined) {
-                setTimeout(cb, 100);
-            }
-        }, true);
-    }, 5000);
+    if (!fluidbook.settings.scorm_commit_immediately) {
+        setInterval(function () {
+            fluidbook.networkControl.executeWhenNetwork(function (cb) {
+                pipwerks.SCORM.save();
+                if (cb !== undefined) {
+                    setTimeout(cb, 100);
+                }
+            }, true);
+        }, 5000);
+    }
 }
 
 function scormSaveCurrentPosition(page, maxPage) {
@@ -257,6 +254,9 @@ function setScormValue(elementName, value) {
         return false;
     }
     var result = pipwerks.SCORM.set(cmi, value);
+    if (fluidbook.settings.scorm_immediate_commit) {
+        pipwerks.SCORM.save();
+    }
     return result;
 }