diff options
| -rw-r--r-- | background.js | 12 | ||||
| -rw-r--r-- | inject-css.js | 12 | ||||
| -rw-r--r-- | manifest.json | 2 | ||||
| -rw-r--r-- | popup/popup.js | 57 |
4 files changed, 53 insertions, 30 deletions
diff --git a/background.js b/background.js index 126c295..affef80 100644 --- a/background.js +++ b/background.js @@ -12,12 +12,14 @@ async function applyCSSToTab(tab) { if (globalSettings.enableStyling === false) return; const data = await browser.storage.local.get("styles"); - const cssFileName = Object.keys(data.styles?.website || {}).find( - (key) => { - const siteName = key.replace(".css", ""); - return hostname === siteName || hostname === `www.${siteName}`; + const cssFileName = Object.keys(data.styles?.website || {}).find((key) => { + const siteName = key.replace(".css", ""); + if (siteName.startsWith("+")) { + const baseSiteName = siteName.slice(1); + return hostname.endsWith(baseSiteName); } - ); + return hostname === siteName || hostname === `www.${siteName}`; + }); if (!cssFileName) return; diff --git a/inject-css.js b/inject-css.js index fc1fc0f..3246255 100644 --- a/inject-css.js +++ b/inject-css.js @@ -19,12 +19,14 @@ if (logging) console.log("inject-css.js script loaded"); const currentUrl = window.location.hostname; if (logging) console.log("Current URL hostname", currentUrl); - const cssFileName = Object.keys(data.styles?.website || {}).find( - (key) => { - const siteName = key.replace(".css", ""); - return currentUrl === siteName || currentUrl === `www.${siteName}`; + const cssFileName = Object.keys(data.styles?.website || {}).find((key) => { + const siteName = key.replace(".css", ""); + if (siteName.startsWith("+")) { + const baseSiteName = siteName.slice(1); + return currentUrl.endsWith(baseSiteName); } - ); + return currentUrl === siteName || currentUrl === `www.${siteName}`; + }); if (!cssFileName) { if (logging) console.log("No CSS file found for current site"); diff --git a/manifest.json b/manifest.json index a829836..bb248d4 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Zen Internet", - "version": "1.3.1", + "version": "1.3.2", "description": "Inject custom css from my repository in real time", "browser_specific_settings": { "gecko": { diff --git a/popup/popup.js b/popup/popup.js index 79edaa9..1882573 100644 --- a/popup/popup.js +++ b/popup/popup.js @@ -71,7 +71,8 @@ new (class ExtensionPopup { restoreSettings() { if (logging) console.log("restoreSettings called"); // Restore global settings - this.enableStylingSwitch.checked = this.globalSettings.enableStyling ?? true; + this.enableStylingSwitch.checked = + this.globalSettings.enableStyling ?? true; this.autoUpdateSwitch.checked = this.globalSettings.autoUpdate ?? false; this.loadCurrentSiteFeatures(); } @@ -79,11 +80,13 @@ new (class ExtensionPopup { async loadSettings() { if (logging) console.log("loadSettings called"); // Load global settings - const globalData = await browser.storage.local.get(this.BROWSER_STORAGE_KEY); + const globalData = await browser.storage.local.get( + this.BROWSER_STORAGE_KEY + ); this.globalSettings = globalData[this.BROWSER_STORAGE_KEY] || { enableStyling: true, autoUpdate: false, - lastFetchedTime: null + lastFetchedTime: null, }; // Load site-specific settings if on a specific site @@ -101,18 +104,20 @@ new (class ExtensionPopup { this.globalSettings.enableStyling = this.enableStylingSwitch.checked; this.globalSettings.autoUpdate = this.autoUpdateSwitch.checked; - browser.storage.local.set({ - [this.BROWSER_STORAGE_KEY]: this.globalSettings - }).then(() => { - if (logging) console.log("Global settings saved"); - this.updateActiveTabStyling(); - }); + browser.storage.local + .set({ + [this.BROWSER_STORAGE_KEY]: this.globalSettings, + }) + .then(() => { + if (logging) console.log("Global settings saved"); + this.updateActiveTabStyling(); + }); // Save site-specific settings if (this.currentSiteHostname) { const siteKey = `${this.BROWSER_STORAGE_KEY}.${this.currentSiteHostname}`; const featureSettings = {}; - + this.currentSiteFeatures .querySelectorAll("input[type=checkbox]") .forEach((checkbox) => { @@ -121,17 +126,19 @@ new (class ExtensionPopup { }); this.siteSettings = featureSettings; - browser.storage.local.set({ - [siteKey]: featureSettings - }).then(() => { - if (logging) console.log("Site settings saved"); - this.updateActiveTabStyling(); - }); + browser.storage.local + .set({ + [siteKey]: featureSettings, + }) + .then(() => { + if (logging) console.log("Site settings saved"); + this.updateActiveTabStyling(); + }); } console.info("Settings saved", { global: this.globalSettings, - site: this.siteSettings + site: this.siteSettings, }); } @@ -178,7 +185,9 @@ new (class ExtensionPopup { featureToggle.innerHTML = ` <span class="feature-name">${displayFeatureName}</span> <label class="toggle-switch"> - <input type="checkbox" name="${currentSiteKey}|${feature}" ${isChecked ? "checked" : ""}> + <input type="checkbox" name="${currentSiteKey}|${feature}" ${ + isChecked ? "checked" : "" + }> <span class="slider round"></span> </label> `; @@ -195,6 +204,10 @@ new (class ExtensionPopup { isCurrentSite(siteName) { if (logging) console.log("isCurrentSite called with", siteName); if (!this.currentSiteHostname) return false; + if (siteName.startsWith("+")) { + const baseSiteName = siteName.slice(1); + return this.currentSiteHostname.endsWith(baseSiteName); + } if (this.currentSiteHostname === siteName) return true; if (this.currentSiteHostname === `www.${siteName}`) return true; return false; @@ -267,7 +280,13 @@ new (class ExtensionPopup { let siteKey = null; for (const site of Object.keys(styles)) { const siteName = site.replace(/\.css$/, ""); - if (hostname === siteName || hostname === `www.${siteName}`) { + if (siteName.startsWith("+")) { + const baseSiteName = siteName.slice(1); + if (hostname.endsWith(baseSiteName)) { + siteKey = site; + break; + } + } else if (hostname === siteName || hostname === `www.${siteName}`) { siteKey = site; break; } |