From efc69eea1c8c0f303d12153357a2b2bfc70a6d25 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Tue, 22 May 2018 16:56:36 -0700
Subject: [PATCH] Fix for logging not being turned on
---
src/hub.html | 7 +++++++
src/hub.js | 6 ------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/hub.html b/src/hub.html
index 62d498438..b72fa2461 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -17,6 +17,13 @@
<% } else { %>
<script src="https://cdn.rawgit.com/aframevr/aframe/3e7a4b3/dist/aframe-master.js" integrity="sha384-EaMOuyBOi9ERV/lVDwQgz/yFWBDWPsIju5Co6oCZZHXuvbLBO81yPWn80q0BbBn3" crossorigin="anonymous"></script>
<% } %>
+
+ <script>
+ // 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(document.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 97470e1db..8cc85a0c7 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -132,17 +132,11 @@ function qsTruthy(param) {
const isBotMode = qsTruthy("bot");
const isTelemetryDisabled = qsTruthy("disable_telemetry");
const isDebug = qsTruthy("debug");
-const logFilter = qs["log_filter"] || (isDebug && "naf-janus-adapter:*");
if (!isBotMode && !isTelemetryDisabled) {
registerTelemetry();
}
-// NOTE: this needs to happen after a-frame's `utils/debug.js` file has been eval'ed because it overwrites any prior debug settings :/
-if (logFilter) {
- debug.enable(logFilter);
-}
-
disableiOSZoom();
AFRAME.registerInputBehaviour("trackpad_dpad4", trackpad_dpad4);
--
GitLab