repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 6787a30fdf4a159bb751e3dace334b88e1621046:
path_to: 
revision_to: 

commit 6787a30fdf4a159bb751e3dace334b88e1621046
Author: James Baicoianu 
Date:   Sat Dec 4 16:54:21 2021 -0800

    Respect serviceworker settings in config file

diff --git a/scripts/client.js b/scripts/client.js

--- a/scripts/client.js
+++ b/scripts/client.js
@@ -15,7 +15,7 @@ elation.require(['engine.engine', 'engine.assets', 'engine.things.light_ambient'
     var fullsize = (container == document.body);

     if (elation.config.get('serviceworker.enabled') && 'serviceWorker' in navigator) {
-      var workerscript = elation.config.get('serviceworker.script', 'serviceworker.js');
+      var workerscript = elation.config.get('serviceworker.script', 'service-worker.js');
       navigator.serviceWorker.register(workerscript)
       .then(function(reg) {
         // registration worked
@@ -104,11 +104,6 @@ elation.require(['engine.engine', 'engine.assets', 'engine.things.light_ambient'
       this.enginecfg.picking = true;
       this.enginecfg.useWebVRPolyfill = elation.utils.any(this.args.useWebVRPolyfill, true);

-      if ('serviceWorker' in navigator) {
-        navigator.serviceWorker.register('service-worker.js');
-      }
-
-
       if ('xr' in navigator) {
         navigator.xr.addEventListener('sessiongranted', (ev) => {
           this.startXR();
diff --git a/scripts/config.js b/scripts/config.js

--- a/scripts/config.js
+++ b/scripts/config.js
@@ -26,6 +26,8 @@ elation.config.set('share.targets.yahoo.clientid', '374523350201-p566ctvssq49sa4
 elation.config.set('share.targets.facebook.clientid', '1197654320349894');
 elation.config.set('share.targets.file.enabled', true);

+elation.config.set('serviceworker.enabled', true);
+
 // FIXME - hack for dev, we should support role-based config
 if (typeof document != 'undefined' && document.location.origin == 'https://bai.dev.supcrit.com') {
   elation.config.set('share.imagebase', null);

-----END OF PAGE-----