morgane/EverShelf
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

chore: auto-merge develop → main

Browse Source 
Triggered by: 0afdf60 fix(kiosk): settings gear lost when Kotlin pre-injects #_kiosk_overlay before JS runs
This commit is contained in:
github-actions[bot]
2026-05-16 12:59:52 +00:00
parent 6ab1da4bd5 0afdf60d38
commit c9a6f8ec42
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/app.js
+18 -3
View File
@@ -2466,7 +2466,24 @@ function _injectKioskOverlay() {
const appHeader = document.querySelector('.app-header'); const appHeader = document.querySelector('.app-header');
if (appHeader) appHeader.classList.add('kiosk-mode'); if (appHeader) appHeader.classList.add('kiosk-mode');
if (document.getElementById('_kiosk_overlay')) return; const btnStyle = 'background:rgba(255,255,255,0.2);border:none;color:#fff;width:34px;height:34px;border-radius:50%;font-size:15px;cursor:pointer;display:flex;align-items:center;justify-content:center;-webkit-tap-highlight-color:transparent;touch-action:manipulation;';
// If the Kotlin onPageFinished already injected #_kiosk_overlay (with only ✕ and ↻),
// just append the missing ⚙️ settings button to it and hide the native Android gear.
const existing = document.getElementById('_kiosk_overlay');
if (existing) {
if (!document.getElementById('_kiosk_settings_btn')) {
const settBtn = document.createElement('button');
settBtn.id = '_kiosk_settings_btn';
settBtn.textContent = '\u2699\uFE0F';
settBtn.title = t('settings.title') || 'Settings';
settBtn.style.cssText = btnStyle.replace('font-size:15px', 'font-size:16px');
settBtn.addEventListener('click', (e) => { e.stopPropagation(); showPage('settings'); });
existing.appendChild(settBtn);
}
try { _kioskBridge.setNativeSettingsVisible(false); } catch(_) {}
return;
}
const headerLeft = document.getElementById('header-left'); const headerLeft = document.getElementById('header-left');
if (!headerLeft) return; if (!headerLeft) return;
@@ -2475,8 +2492,6 @@ function _injectKioskOverlay() {
wrap.id = '_kiosk_overlay'; wrap.id = '_kiosk_overlay';
wrap.style.cssText = 'display:flex;gap:6px;align-items:center;'; wrap.style.cssText = 'display:flex;gap:6px;align-items:center;';
const btnStyle = 'background:rgba(255,255,255,0.2);border:none;color:#fff;width:34px;height:34px;border-radius:50%;font-size:15px;cursor:pointer;display:flex;align-items:center;justify-content:center;-webkit-tap-highlight-color:transparent;touch-action:manipulation;';
// Exit button // Exit button
const exitBtn = document.createElement('button'); const exitBtn = document.createElement('button');
exitBtn.id = '_kiosk_exit_btn'; exitBtn.id = '_kiosk_exit_btn';