Fixed #1270 - Flashcards and 360 pages do not work in offline export

thexerteproject · Jan 14, 2024 · f8abb39 · f8abb39
1 parent cbc71f6
commit f8abb39
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/modules/xerte/parent_templates/Nottingham/common_html5/js/xenith.js b/modules/xerte/parent_templates/Nottingham/common_html5/js/xenith.js
@@ -138,11 +138,6 @@ $(document).keydown(function(e) {
 });
 
 $(document).ready(function() {
-	// Load the loadjs dependency loader
-    if (!xot_offline) {
-        // TODO - we should move this to play/preview and let it kickstart the loading of all files
-        $.getScript(x_templateLocation + "common_html5/js/loadjs.min.js");
-    }
 
     $x_mainHolder = $("#x_mainHolder");
 

diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/media360.html b/modules/xerte/parent_templates/Nottingham/models_html5/media360.html
@@ -91,14 +91,13 @@
 			var filePath = x_templateLocation + 'common_html5/js/pannellum/';
 
 			x_insertCSS(filePath + 'pannellum.css');
-
-			$.getScript(filePath + 'pannellum.js')
-				.done(function(script, textStatus) {
+			loadjs.path(filePath);
+			loadjs(['pannellum.js'], {
+				success: function() {
 					media360.begin();
-				})
-				.fail(function( jqxhr, settings, exception ) {
-					console.log("Failed to load pannellum files: " + exception);
-				});
+				}
+			});
+
 		}
 
 		this.begin = function() {

diff --git a/modules/xerte/player_html5/rloObject.htm b/modules/xerte/player_html5/rloObject.htm
@@ -121,6 +121,7 @@ <h2 aria-live="assertive"> </h2>
 
 	<script type="text/javascript" src="%TEMPLATEPATH%common_html5/js/xenith.js%VERSION_PARAM%"></script>
 	<script type="text/javascript" src="%TEMPLATEPATH%common_html5/js/chart.js%VERSION_PARAM%"></script>
+	<script type="text/javascript" src="%TEMPLATEPATH%common_html5/js/loadjs.min.js%VERSION_PARAM%"></script>
 
     %TRACKING_SUPPORT%
     <script type="text/javascript" async src="%MATHJAXPATH%MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script>