From 22b3666cf0d8626a43437bc6fa8587030971fcfb Mon Sep 17 00:00:00 2001 From: SethBurkart123 Date: Sun, 7 Apr 2024 16:30:57 +1000 Subject: [PATCH] add fallback colors for color functions in case of error --- src/SEQTA.ts | 1 + src/seqta/ui/colors/ColorLuminance.ts | 4 ++++ src/seqta/ui/colors/Manager.ts | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/SEQTA.ts b/src/SEQTA.ts index 0f2d5e74..22ed0338 100644 --- a/src/SEQTA.ts +++ b/src/SEQTA.ts @@ -1556,6 +1556,7 @@ function CheckCurrentLesson(lesson: any, num: number) { } export function GetThresholdOfColor(color: any) { + if (!color) return 0 // Case-insensitive regular expression for matching RGBA colors const rgbaRegex = /rgba?\(([^)]+)\)/gi diff --git a/src/seqta/ui/colors/ColorLuminance.ts b/src/seqta/ui/colors/ColorLuminance.ts index 2605f36d..ee796be5 100644 --- a/src/seqta/ui/colors/ColorLuminance.ts +++ b/src/seqta/ui/colors/ColorLuminance.ts @@ -15,6 +15,10 @@ function adjustLuminance(color: any, lum: any) { } export default function ColorLuminance(color: any, lum = 0) { + if (color == '' || color == null) { + // light cyan blue + return '#00bfff'; + } const colorRegex = /rgba?\(([^)]+)\)/gi; // Case-insensitive match for rgb() or rgba() if (color.toLowerCase().includes('gradient')) { diff --git a/src/seqta/ui/colors/Manager.ts b/src/seqta/ui/colors/Manager.ts index 53098581..f79ca4eb 100644 --- a/src/seqta/ui/colors/Manager.ts +++ b/src/seqta/ui/colors/Manager.ts @@ -18,7 +18,7 @@ let DarkMode: any = null; export function updateAllColors(storedSetting: any, newColor = null) { // Determine the color to use - const selectedColor = newColor || storedSetting.selectedColor; + const selectedColor = newColor || storedSetting.selectedColor == '' ? '#007bff' : storedSetting.selectedColor; if (storedSetting.transparencyEffects) { document.documentElement.classList.add('transparencyEffects');