Fix pause button behavior and Electron update path detection
- Change pause button icon from emoji to proper pause symbol (two vertical bars) - Update pause button title to 'Pause rotation' for clarity - Improve pause button logic comments for better code documentation - Add additional search paths for manual Electron update (HOME, parent dir) - Enhance manual Electron update error message with more search locations Fixes pause button display issues and improves kiosk-app detection
This commit is contained in:
+24
-4
@@ -3733,8 +3733,9 @@ function attachView(i){
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Control pause button visibility based on site duration
|
// Control pause button visibility based on site duration
|
||||||
|
// Show on rotation sites (duration > 0), hide on manual sites (duration = 0)
|
||||||
const siteDuration=parseInt(tabs[tabIdx].duration)||0;
|
const siteDuration=parseInt(tabs[tabIdx].duration)||0;
|
||||||
const shouldShow=siteDuration!==0; // Hide on manual sites (duration=0)
|
const shouldShow=siteDuration>0;
|
||||||
views[i].webContents.send('pause-button-visibility',shouldShow);
|
views[i].webContents.send('pause-button-visibility',shouldShow);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5146,8 +5147,8 @@ window.addEventListener('DOMContentLoaded',()=>{
|
|||||||
|
|
||||||
pauseButton=document.createElement('div');
|
pauseButton=document.createElement('div');
|
||||||
pauseButton.id='electron-pause-button';
|
pauseButton.id='electron-pause-button';
|
||||||
pauseButton.innerHTML='⏸️';
|
pauseButton.innerHTML='<div style="display:flex;gap:4px;"><div style="width:6px;height:24px;background:white;border-radius:2px;"></div><div style="width:6px;height:24px;background:white;border-radius:2px;"></div></div>';
|
||||||
pauseButton.title='Pause timers';
|
pauseButton.title='Pause rotation';
|
||||||
pauseButton.style.cssText=`
|
pauseButton.style.cssText=`
|
||||||
position:fixed;bottom:20px;left:20px;width:60px;height:60px;
|
position:fixed;bottom:20px;left:20px;width:60px;height:60px;
|
||||||
background:rgba(230,126,34,0.95);border:3px solid rgba(255,255,255,0.9);
|
background:rgba(230,126,34,0.95);border:3px solid rgba(255,255,255,0.9);
|
||||||
@@ -8271,7 +8272,16 @@ manual_electron_update() {
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Method 3: Check current directory
|
# Method 3: Check current user's home directory
|
||||||
|
if [ -z "$DETECTED_KIOSK_DIR" ]; then
|
||||||
|
local current_user_home="$HOME"
|
||||||
|
if [ -d "$current_user_home/kiosk-app" ] && [ -f "$current_user_home/kiosk-app/main.js" ]; then
|
||||||
|
DETECTED_KIOSK_USER=$(whoami)
|
||||||
|
DETECTED_KIOSK_DIR="$current_user_home/kiosk-app"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Method 4: Check current directory
|
||||||
if [ -z "$DETECTED_KIOSK_DIR" ]; then
|
if [ -z "$DETECTED_KIOSK_DIR" ]; then
|
||||||
if [ -f "$PWD/kiosk-app/main.js" ]; then
|
if [ -f "$PWD/kiosk-app/main.js" ]; then
|
||||||
DETECTED_KIOSK_USER=$(whoami)
|
DETECTED_KIOSK_USER=$(whoami)
|
||||||
@@ -8279,6 +8289,14 @@ manual_electron_update() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Method 5: Check parent directory
|
||||||
|
if [ -z "$DETECTED_KIOSK_DIR" ]; then
|
||||||
|
if [ -f "$(dirname "$PWD")/kiosk-app/main.js" ]; then
|
||||||
|
DETECTED_KIOSK_USER=$(whoami)
|
||||||
|
DETECTED_KIOSK_DIR="$(dirname "$PWD")/kiosk-app"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Check if we found a kiosk installation
|
# Check if we found a kiosk installation
|
||||||
if [ -z "$DETECTED_KIOSK_DIR" ] || [ ! -d "$DETECTED_KIOSK_DIR" ]; then
|
if [ -z "$DETECTED_KIOSK_DIR" ] || [ ! -d "$DETECTED_KIOSK_DIR" ]; then
|
||||||
echo "✗ Kiosk installation not found!"
|
echo "✗ Kiosk installation not found!"
|
||||||
@@ -8286,7 +8304,9 @@ manual_electron_update() {
|
|||||||
echo "Searched locations:"
|
echo "Searched locations:"
|
||||||
echo " - /home/$KIOSK_USER/kiosk-app"
|
echo " - /home/$KIOSK_USER/kiosk-app"
|
||||||
echo " - /home/*/kiosk-app"
|
echo " - /home/*/kiosk-app"
|
||||||
|
echo " - $HOME/kiosk-app"
|
||||||
echo " - $PWD/kiosk-app"
|
echo " - $PWD/kiosk-app"
|
||||||
|
echo " - $(dirname "$PWD")/kiosk-app"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Debug info:"
|
echo "Debug info:"
|
||||||
echo " Current user: $(whoami)"
|
echo " Current user: $(whoami)"
|
||||||
|
|||||||
Reference in New Issue
Block a user