]> _ Git - fluidbook-html5.git/commitdiff
wip #5112
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 25 May 2022 13:40:32 +0000 (15:40 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 25 May 2022 13:40:32 +0000 (15:40 +0200)
js/libs/fluidbook/fluidbook.scorm.js
js/libs/fluidbook/fluidbook.stats.js
js/main.js

index 97f12258993b91e89566a67b701dda4bcf9f28f4..a0208bb5362bc413c489fa4f30abc89b6da7f2ba 100644 (file)
@@ -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(',');
         }
 
index 197c1d35c5755af9cdea419e86820768309efb9c..dec849690e72495e45050b9aa949fae2782f88c6 100644 (file)
@@ -119,12 +119,12 @@ FluidbookStats.prototype = {
                         location += '#/' + hash;\r
                         custom_vars.url = location;\r
 \r
-\r
-                        $.extend(window.tc_vars, {event: 'pageview'}, $this.fluidbook.settings.tagcommander_default_vars, custom_vars, $this.fluidbook.settings.tagcommander_plan[hash]);\r
-                        console.log(custom_vars);\r
+                        $.extend(window.tc_vars, $this.fluidbook.settings.tagcommander_default_vars, custom_vars, $this.fluidbook.settings.tagcommander_plan[hash]);\r
                         console.info('Tag commander', window.tc_vars);\r
                         try {\r
-                            tC.container.reload({events: {page: [{}, {}]}});\r
+                            var o = {events: {}};\r
+                            o.events[$this.fluidbook.settings.tagcommander_event_page] = [{}, {}];\r
+                            tC.container.reload(o);\r
                         } catch (e) {\r
                             console.error(e);\r
                         }\r
index dfd707812152f0326ec8fba6293c31b35e8856c1..5ba9e6d44415a52ad9b389a7a427045c369790e4 100644 (file)
@@ -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;