myron/jarvis
1
0
Fork 0
mirror of https://github.com/myronblair/jarvis synced 2026-06-30 17:50:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

revert: restore safe JS, keep only kiosk-mode CSS class toggle — voice patches caused JS crash

Browse Source
This commit is contained in:
Myron Blair
2026-06-21 05:03:56 +00:00
parent aa88a2f73b
commit aaf9f9d56a
3 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public_html/assets/js/jarvis-app.js
+5 -10
View File
@@ -161,7 +161,7 @@ function showApp(name, greeting, silent = false) {
} }
}, 30000); }, 30000);
setInterval(() => { setInterval(() => {
if (voiceMode && !document.body.classList.contains("kiosk-mode") && voiceLastCmd > 0 && Date.now() - voiceLastCmd > VOICE_SLEEP_MS) { if (voiceMode && voiceLastCmd > 0 && Date.now() - voiceLastCmd > VOICE_SLEEP_MS) {
exitVoiceMode(); exitVoiceMode();
} }
}, 60000); }, 60000);
@@ -1322,15 +1322,11 @@ function initVoice() {
// Sleeping: ONLY respond to master wake phrases // Sleeping: ONLY respond to master wake phrases
if (isAsleep) { if (isAsleep) {
if (WAKE_PHRASES.some(p => lc.includes(p))) wakeFromSleep(); if (WAKE_PHRASES.some(p => lc.includes(p))) wakeFromSleep();
// In kiosk mode: wake word also wakes from sleep return;
if (document.body.classList.contains("kiosk-mode")) { wakeFromSleep(); }
else return;
} }
if (!voiceMode) { if (!voiceMode) {
if (WAKE_PHRASES.some(p => lc.includes(p))) enterVoiceMode(); if (WAKE_PHRASES.some(p => lc.includes(p))) enterVoiceMode();
// Kiosk: any speech enters conversation mode
else if (document.body.classList.contains("kiosk-mode") && transcript.length > 2) enterVoiceMode("kiosk");
} else if (!voiceMuted) { } else if (!voiceMuted) {
voiceLastCmd = Date.now(); voiceLastCmd = Date.now();
voiceActive = Date.now(); voiceActive = Date.now();
@@ -1803,16 +1799,14 @@ async function toggleKiosk() {
if (activeTab && (activeTab.id === "tab-agents" || activeTab.id === "tab-guardian")) { if (activeTab && (activeTab.id === "tab-agents" || activeTab.id === "tab-guardian")) {
switchTab("intel"); switchTab("intel");
} }
document.body.classList.add("kiosk-mode");
if (btn) { btn.textContent = "⧞ EXIT"; btn.style.color = "var(--cyan)"; } if (btn) { btn.textContent = "⧞ EXIT"; btn.style.color = "var(--cyan)"; }
// Kiosk: auto-start mic and enter always-on conversation mode
if (isAsleep) wakeFromSleep();
if (!voiceMode) enterVoiceMode("kiosk");
if (!isListening) { isListening = true; updateMicBtn(); if (recognition) try { recognition.start(); } catch(_) {} }
} else { } else {
const ex = document.exitFullscreen || document.webkitExitFullscreen || document.mozCancelFullScreen || document.msExitFullscreen; const ex = document.exitFullscreen || document.webkitExitFullscreen || document.mozCancelFullScreen || document.msExitFullscreen;
if (ex) ex.call(document).catch(() => {}); if (ex) ex.call(document).catch(() => {});
if (_wakeLock) { _wakeLock.release().catch(() => {}); _wakeLock = null; } if (_wakeLock) { _wakeLock.release().catch(() => {}); _wakeLock = null; }
document.body.classList.remove("kiosk-mode"); document.body.classList.remove("kiosk-mode");
document.body.classList.remove("kiosk-mode");
if (btn) { btn.textContent = "⧞ KIOSK"; btn.style.color = ""; } if (btn) { btn.textContent = "⧞ KIOSK"; btn.style.color = ""; }
if (!isTablet()) document.body.classList.remove("tablet-mode"); if (!isTablet()) document.body.classList.remove("tablet-mode");
} }
@@ -1829,6 +1823,7 @@ function _onFsChange() {
if (!document.fullscreenElement && !document.webkitFullscreenElement) { if (!document.fullscreenElement && !document.webkitFullscreenElement) {
if (_wakeLock) { _wakeLock.release().catch(() => {}); _wakeLock = null; } if (_wakeLock) { _wakeLock.release().catch(() => {}); _wakeLock = null; }
document.body.classList.remove("kiosk-mode"); document.body.classList.remove("kiosk-mode");
document.body.classList.remove("kiosk-mode");
if (btn) { btn.textContent = "⧞ KIOSK"; btn.style.color = ""; } if (btn) { btn.textContent = "⧞ KIOSK"; btn.style.color = ""; }
if (!isTablet()) document.body.classList.remove("tablet-mode"); if (!isTablet()) document.body.classList.remove("tablet-mode");
} }
public_html/assets/js/jarvis-overlays.js
-1
View File
@@ -6,7 +6,6 @@ var SLEEP_CMDS = /\b(good\s*night(\s*jarvis)?|go\s*to\s*sleep|sleep\s*mode|shut\
function enterSleepMode() { function enterSleepMode() {
if (isAsleep) return; if (isAsleep) return;
if (document.body.classList.contains("kiosk-mode")) return; // never sleep in kiosk
isAsleep = true; isAsleep = true;
// Pause voice mode // Pause voice mode
public_html/index.html
+7 -7
View File
@@ -6,7 +6,7 @@
<title>JARVIS — Integrated Defense and Logistics System</title> <title>JARVIS — Integrated Defense and Logistics System</title>
<link rel="preconnect" href="https://fonts.googleapis.com"/> <link rel="preconnect" href="https://fonts.googleapis.com"/>
<link href="https://fonts.googleapis.com/css2?family=Orbitron:wght@400;600;700;900&family=Rajdhani:wght@300;400;500;600&family=Share+Tech+Mono&display=swap" rel="stylesheet"/> <link href="https://fonts.googleapis.com/css2?family=Orbitron:wght@400;600;700;900&family=Rajdhani:wght@300;400;500;600&family=Share+Tech+Mono&display=swap" rel="stylesheet"/>
<link rel="stylesheet" href="assets/css/jarvis.css?v=20260621e"/> <link rel="stylesheet" href="assets/css/jarvis.css?v=20260621f"/>
</head> </head>
<body> <body>
<canvas id="particleCanvas"></canvas> <canvas id="particleCanvas"></canvas>
@@ -426,12 +426,12 @@
style="position:fixed;top:-9999px;left:-9999px;width:320px;height:240px"></video> style="position:fixed;top:-9999px;left:-9999px;width:320px;height:240px"></video>
<script data-cfasync="false" src="https://cdn.jsdelivr.net/npm/face-api.js@0.22.2/dist/face-api.min.js" crossorigin="anonymous"></script> <script data-cfasync="false" src="https://cdn.jsdelivr.net/npm/face-api.js@0.22.2/dist/face-api.min.js" crossorigin="anonymous"></script>
<script data-cfasync="false" src="assets/js/jarvis-effects.js?v=20260621e"></script> <script data-cfasync="false" src="assets/js/jarvis-effects.js?v=20260621f"></script>
<script data-cfasync="false" src="assets/js/jarvis-overlays.js?v=20260621e"></script> <script data-cfasync="false" src="assets/js/jarvis-overlays.js?v=20260621f"></script>
<script data-cfasync="false" src="assets/js/jarvis-app.js?v=20260621e"></script> <script data-cfasync="false" src="assets/js/jarvis-app.js?v=20260621f"></script>
<script data-cfasync="false" src="assets/js/panels/jarvis-arc.js?v=20260621e"></script> <script data-cfasync="false" src="assets/js/panels/jarvis-arc.js?v=20260621f"></script>
<script data-cfasync="false" src="assets/js/panels/jarvis-agents.js?v=20260621e"></script> <script data-cfasync="false" src="assets/js/panels/jarvis-agents.js?v=20260621f"></script>
<script data-cfasync="false" src="assets/js/panels/jarvis-assistant.js?v=20260621e"></script> <script data-cfasync="false" src="assets/js/panels/jarvis-assistant.js?v=20260621f"></script>
<!-- VISION LIGHTBOX --> <!-- VISION LIGHTBOX -->
<div id="vision-lightbox"> <div id="vision-lightbox">