From accbc37a12843b7dbd8a975c834df04cfe028496 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 12 Nov 2020 17:44:50 +0100 Subject: [PATCH] This reverts commit bbed50e1 --- js/libs/scorm/scorm.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/js/libs/scorm/scorm.js b/js/libs/scorm/scorm.js index b2e550c5..a4adc34b 100644 --- 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; -- 2.39.5