This reverts commit bbed50e1

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