Include the license script in XHTML, see #1413

phetsims · Jan 2, 2024 · ab80eb7 · ab80eb7
1 parent 932244f
commit ab80eb7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/js/grunt/buildRunnable.js b/js/grunt/buildRunnable.js
@@ -330,6 +330,7 @@ module.exports = async function( repo, minifyOptions, allHTML, brand, localesOpt
     stringMap: stringMap,
     htmlHeader: htmlHeader,
     initializationScript: xhtmlInitializationScript,
+    licenseScript: licenseScript,
     scripts: productionScripts
   } );
 

diff --git a/js/grunt/packageXHTML.js b/js/grunt/packageXHTML.js
@@ -31,6 +31,7 @@ module.exports = function( xhtmlDir, config ) {
     brand, // {string}
     stringMap, // {Object}, map[ locale ][ stringKey ] => {string}
     initializationScript, // {string} - separate from the rest of the scripts since it needs to be able to run in IE.
+    licenseScript, // {string}
     scripts, // {Array.<string>}
     htmlHeader // {string}
   } = config;
@@ -41,6 +42,7 @@ module.exports = function( xhtmlDir, config ) {
 
   const localizedTitle = stringMap[ ChipperConstants.FALLBACK_LOCALE ][ getTitleStringKey( repo ) ];
 
+  const licenseScriptFilename = `${repo}_license_${brand}.js`;
   const initializationScriptFilename = `${repo}_initialization_${brand}.js`;
 
   const script = scripts.join( '\n' );
@@ -49,10 +51,11 @@ module.exports = function( xhtmlDir, config ) {
   const xhtml = ChipperStringUtils.replacePlaceholders( grunt.file.read( '../chipper/templates/sim.xhtml' ), {
     PHET_SIM_TITLE: encoder.htmlEncode( localizedTitle ),
     PHET_HTML_HEADER: htmlHeader,
-    PHET_INITIALIZATION_SCRIPT: `<script type="text/javascript" src="${initializationScriptFilename}" charset="utf-8"></script>`,
+    PHET_INITIALIZATION_SCRIPT: `<script type="text/javascript" src="${licenseScriptFilename}" charset="utf-8"></script><script type="text/javascript" src="${initializationScriptFilename}" charset="utf-8"></script>`,
     PHET_SIM_SCRIPTS: `<script type="text/javascript" src="${scriptFilename}" charset="utf-8"></script>`
   } );
   grunt.file.write( `${xhtmlDir}/${repo}_all${brand === 'phet' ? '' : `_${brand}`}.xhtml`, xhtml );
+  grunt.file.write( `${xhtmlDir}/${licenseScriptFilename}`, licenseScript );
   grunt.file.write( `${xhtmlDir}/${initializationScriptFilename}`, initializationScript );
   grunt.file.write( `${xhtmlDir}/${scriptFilename}`, script );
 };
diff --git a/templates/chipper-initialization.js b/templates/chipper-initialization.js
@@ -1,6 +1,3 @@
-window.phet = window.phet|| {};
-window.phet.chipper = window.phet.chipper || {};
-
 window.phet.chipper.project = '{{PHET_PROJECT}}';
 window.phet.chipper.version = '{{PHET_VERSION}}';
 window.phet.chipper.buildTimestamp = '{{PHET_BUILD_TIMESTAMP}}';