From ab5f538d3e13a5f5e5fae826b70ad460d0911e7c Mon Sep 17 00:00:00 2001 From: Greg Fodor <gfodor@gmail.com> Date: Tue, 22 May 2018 22:17:23 -0700 Subject: [PATCH] Try again --- src/hub.html | 8 -------- src/hub.js | 10 +++++----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/hub.html b/src/hub.html index d2c83b46a..62d498438 100644 --- a/src/hub.html +++ b/src/hub.html @@ -17,14 +17,6 @@ <% } else { %> <script src="https://cdn.rawgit.com/aframevr/aframe/3e7a4b3/dist/aframe-master.js" integrity="sha384-EaMOuyBOi9ERV/lVDwQgz/yFWBDWPsIju5Co6oCZZHXuvbLBO81yPWn80q0BbBn3" crossorigin="anonymous"></script> <% } %> - - - <!-- HACK: this has to run after A-Frame but before our bundle, since A-Frame blows away the local storage setting --> - <script> - if (/[&?]debug=true/.test(window.location.search) && typeof localStorage !== "undefined") { - localStorage.debug = "naf-janus-adapter:*"; - } - </script> </head> <body data-html-prefix="<%= HTML_PREFIX %>"> diff --git a/src/hub.js b/src/hub.js index 2b88247d0..e2d486de0 100644 --- a/src/hub.js +++ b/src/hub.js @@ -1,3 +1,8 @@ +// HACK: this has to run after A-Frame but before our bundle, since A-Frame blows away the local storage setting --> +if (/[&?]debug=true/.test(window.location.search) && typeof localStorage !== "undefined") { + localStorage.debug = "naf-janus-adapter:*"; +} + import "./assets/stylesheets/hub.scss"; import moment from "moment-timezone"; import queryString from "query-string"; @@ -7,11 +12,6 @@ patchWebGLRenderingContext(); import "aframe-xr"; -// HACK: this has to run after A-Frame but before our bundle, since A-Frame blows away the local storage setting -if (/[&?]debug=true/.test(window.location.search) && typeof localStorage !== "undefined") { - localStorage.debug = "naf-janus-adapter:*"; -} - import "./vendor/GLTFLoader"; import "networked-aframe/src/index"; import "naf-janus-adapter"; -- GitLab