From 21b85381f4185383f6c9f186350f28c8a09bd254 Mon Sep 17 00:00:00 2001 From: sameerasw Date: Mon, 14 Apr 2025 23:03:03 +0530 Subject: Fixes for #10, removed the useles inject-css.js in favor of the background.js --- data-viewer/data-viewer.js | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'data-viewer/data-viewer.js') diff --git a/data-viewer/data-viewer.js b/data-viewer/data-viewer.js index d38f53f..f6dd566 100644 --- a/data-viewer/data-viewer.js +++ b/data-viewer/data-viewer.js @@ -334,11 +334,28 @@ document.addEventListener("DOMContentLoaded", function () { // Get site settings if available const siteName = website.replace(".css", ""); - const domainName = siteName.startsWith("+") - ? siteName.slice(1) - : siteName; - const settingsData = - siteSettings[domainName] || siteSettings[`www.${domainName}`] || {}; + let domainName; + // Declare settingsData at a higher scope so it's accessible throughout the function + let settingsData = {}; + + // Handle wildcard sites correctly + if (siteName.startsWith("+")) { + domainName = siteName.slice(1); + // For wildcard sites, we need to find any matching domain in settings + const matchingDomains = Object.keys(siteSettings).filter( + (domain) => domain === domainName || domain.endsWith(`.${domainName}`) + ); + + // Use the first matching domain's settings if any found + const settingsKey = + matchingDomains.length > 0 ? matchingDomains[0] : null; + settingsData = settingsKey ? siteSettings[settingsKey] : {}; + } else { + // For direct domains, just check the domain and www.domain + domainName = siteName; + settingsData = + siteSettings[domainName] || siteSettings[`www.${domainName}`] || {}; + } header.innerHTML = `
-- cgit v1.2.3