From f6693e8af0726a0d84dee14ba7061bf0d1ab374b Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 25 May 2022 15:40:32 +0200
Subject: [PATCH] wip #5112

---
 js/libs/fluidbook/fluidbook.scorm.js | 2 +-
 js/libs/fluidbook/fluidbook.stats.js | 8 ++++----
 js/main.js                           | 6 +++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/js/libs/fluidbook/fluidbook.scorm.js b/js/libs/fluidbook/fluidbook.scorm.js
index 97f12258..a0208bb5 100644
--- a/js/libs/fluidbook/fluidbook.scorm.js
+++ b/js/libs/fluidbook/fluidbook.scorm.js
@@ -15,7 +15,7 @@ FluidbookScorm.prototype = {
             this.ok = initScorm();
         }
 
-        if (this.fluidbook.settings.scorm_variables.linkstocomplete) {
+        if (this.fluidbook.settings.scorm_variables !== undefined && this.fluidbook.settings.scorm_variables.linkstocomplete !== undefined) {
             this.linksToComplete = this.fluidbook.settings.scorm_variables.linkstocomplete.split(',');
         }
 
diff --git a/js/libs/fluidbook/fluidbook.stats.js b/js/libs/fluidbook/fluidbook.stats.js
index 197c1d35..dec84969 100644
--- a/js/libs/fluidbook/fluidbook.stats.js
+++ b/js/libs/fluidbook/fluidbook.stats.js
@@ -119,12 +119,12 @@ FluidbookStats.prototype = {
                         location += '#/' + hash;
                         custom_vars.url = location;
 
-
-                        $.extend(window.tc_vars, {event: 'pageview'}, $this.fluidbook.settings.tagcommander_default_vars, custom_vars, $this.fluidbook.settings.tagcommander_plan[hash]);
-                        console.log(custom_vars);
+                        $.extend(window.tc_vars, $this.fluidbook.settings.tagcommander_default_vars, custom_vars, $this.fluidbook.settings.tagcommander_plan[hash]);
                         console.info('Tag commander', window.tc_vars);
                         try {
-                            tC.container.reload({events: {page: [{}, {}]}});
+                            var o = {events: {}};
+                            o.events[$this.fluidbook.settings.tagcommander_event_page] = [{}, {}];
+                            tC.container.reload(o);
                         } catch (e) {
                             console.error(e);
                         }
diff --git a/js/main.js b/js/main.js
index dfd70781..5ba9e6d4 100644
--- a/js/main.js
+++ b/js/main.js
@@ -263,7 +263,11 @@ try {
         if (null != gal) {
             fluidbook.gal = gal;
         }
-        window.fluidbook.loadPlugins();
+        try {
+            window.fluidbook.loadPlugins();
+        }catch (e){
+
+        }
         $(document).trigger('fluidbook.init');
 
         desktopScale = 1;
-- 
2.39.5