fixes

Author: reloxx13

assets/js/admin/buttons.js

@@ -78,6 +78,12 @@ $(function () {
             });
     });
 
+    $('#screensaver-preview-btn').on('click', function (e) {
+        e.preventDefault();
+        window.open('../?screensaverPreview=1', '_blank');
+        return false;
+    });
+
     $('#layout-generator').on('click', function (ev) {
         ev.preventDefault();
         window.open('../admin/generator');

assets/js/core.js

@@ -80,10 +80,6 @@ const photoBooth = (function () {
         screensaverSwitchMs = (config.screensaver.switch_minutes || 1) * 60000,
         urlSafe = (src) => (src ? encodeURI(src) : '');
 
-    if (!config.screensaver.text_position) {
-        config.screensaver.text_position = 'center';
-    }
-
     let timeOut,
         chromaFile = '',
         currentCollageFile = '',
@@ -94,8 +90,6 @@ const photoBooth = (function () {
         endTime,
         totalTime;
 
-    const galleryFallbackSource = () => config.screensaver.image_source || '';
-
     api.takingPic = false;
     api.nextCollageNumber = 0;
     api.chromaimage = '';
@@ -183,7 +177,6 @@ const photoBooth = (function () {
         screensaverTimeoutMs,
         screensaverSwitchMs,
         urlSafe,
-        galleryFallbackSource,
         photoboothTools
     });
 

assets/js/screensaver.js

@@ -23,6 +23,8 @@
             photoboothTools
         } = deps;
 
+        const fallbackSource = galleryFallbackSource || (() => config.screensaver.image_source || '');
+
         let screensaverTimeout;
         let screensaverSwitchTimeout;
         let screensaverFlip = false;
@@ -75,7 +77,6 @@
 
         api.toggleGalleryText = function toggleGalleryText() {
             const screensaverText = config.screensaver.text;
-            const screensaverTextColor = config.screensaver.text_color || '#ffffff';
             const baseColor = config.screensaver.text_backdrop_color || '#202020';
             const alpha = parseFloat(config.screensaver.text_backdrop_opacity);
             const safeAlpha = Number.isFinite(alpha) ? Math.min(Math.max(alpha, 0), 1) : 0.55;
@@ -110,7 +111,6 @@
             const setSlot = (text) => {
                 resetSlots();
                 [textTop, textCenter, textBottom].forEach(($el) => {
-                    $el.css('color', screensaverTextColor);
                     $el.css('background', screensaverBackdrop);
                 });
                 if (showCenter) {
@@ -214,10 +214,7 @@
             }
 
             const source = api.resolveSource();
-            let finalSource = source;
-            if (!source) {
-                finalSource = galleryFallbackSource();
-            }
+            const finalSource = source || fallbackSource();
             if (!finalSource) {
                 api.resetTimer();
                 return;
@@ -241,7 +238,7 @@
                 overlay.css('background-image', 'none');
                 imageEl
                     .one('error', function () {
-                        const fallback = galleryFallbackSource();
+                        const fallback = fallbackSource();
                         if (fallback && fallback !== finalSource) {
                             screensaverLastGallerySource = fallback;
                             $(this).attr('src', urlSafe(fallback));