wait #4055 @0.5

diff --git a/js/libs/scorm/scorm.js b/js/libs/scorm/scorm.js
index a4adc34b835dd47310a6bf421002661f29a1221d..b2e550c5e2d60f7b4bd7e79f2d289592736fe411 100644 (file)
--- a/js/libs/scorm/scorm.js
+++ b/js/libs/scorm/scorm.js
@@ -47,8 +47,8 @@ function initScorm() {
         if (FORCE_SCORM) {
             SCORM_OK = true;
         }
-    }catch (e) {
-        
+    } catch (e) {
+
     }
 
     if (SCORM_OK) {
@@ -170,6 +170,7 @@ function finishScorm() {
     setSessionTime();
     pipwerks.SCORM.save();
     pipwerks.SCORM.quit();
+    scormCloseWindow();
 }
 
 function scormMarkAsComplete() {
@@ -178,7 +179,7 @@ function scormMarkAsComplete() {
     }
     scormExit();
     setScormValue('status', "completed");
-    if (!fluidbook.scorm.manageScore) {
+    if (!fluidbook.scorm.manageScore && fluidbook.settings.scorm_pass_on_complete) {
         setScormValue('success_status', 'passed');
     }
 }
@@ -210,12 +211,16 @@ function scormComplete() {
         return;
     }
     setTimeout(function () {
-        parent.close();
-        top.close();
-        window.close();
+        scormCloseWindow();
     }, 1500);
 }
 
+function scormCloseWindow() {
+    parent.close();
+    top.close();
+    window.close();
+}
+
 function getScormValue(elementName) {
     if (!SCORM_OK) {
         return null;