refactor: decompose CSS, unify dark mode, extract shared modules
Structural cleanup based on thermo-nuclear code quality review: - Extract shared color-picker.css and color-popover.css from badges.css (611→85 lines) - Extract shared lib/presets.js for preset CRUD used by popup and popover - Unify dark mode to single applyDarkModeClass on <html>, removing 4 scattered functions - Fix stale closure in startPostObserver, data-driven reload key check - Remove dead exports, getHelpers wrapper, duplicated colorToHex - Replace DOM expando properties with state array in popup.js Net: -318 lines of duplication, no file over 401 lines. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
271
popup/popup.css
271
popup/popup.css
@@ -210,7 +210,7 @@ fieldset input[type="text"] {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* --- Preset badges --- */
|
||||
/* --- Popup-specific preset bar --- */
|
||||
.rt-preset-bar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -218,272 +218,3 @@ fieldset input[type="text"] {
|
||||
flex-wrap: wrap;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.rt-preset-list {
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.rt-preset-badge {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
border: 1px solid;
|
||||
border-radius: 3px;
|
||||
padding: 2px 6px;
|
||||
font-size: 10px;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
line-height: 1.4;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.rt-preset-badge:hover {
|
||||
filter: brightness(1.1);
|
||||
}
|
||||
|
||||
.rt-preset-delete {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: -6px;
|
||||
right: -6px;
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
background: #d9534f;
|
||||
color: white;
|
||||
border-radius: 50%;
|
||||
font-size: 10px;
|
||||
line-height: 14px;
|
||||
text-align: center;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.rt-preset-badge:hover .rt-preset-delete {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.rt-preset-add {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
border: 1px dashed #ccc;
|
||||
border-radius: 3px;
|
||||
background: none;
|
||||
color: #999;
|
||||
font-size: 14px;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-shrink: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.rt-preset-add:hover {
|
||||
border-color: #999;
|
||||
color: #666;
|
||||
background: #f5f5f5;
|
||||
}
|
||||
|
||||
/* --- Color Picker Widget --- */
|
||||
.rt-color-picker {
|
||||
margin: 8px 0;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.rt-picker-tabs {
|
||||
display: flex;
|
||||
border-bottom: 1px solid #ccc;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.rt-picker-tab {
|
||||
flex: 1;
|
||||
padding: 4px 8px;
|
||||
background: none;
|
||||
border: none;
|
||||
border-bottom: 2px solid transparent;
|
||||
font-size: 11px;
|
||||
font-family: inherit;
|
||||
cursor: pointer;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.rt-picker-tab:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.rt-picker-tab--active {
|
||||
color: #1a1a1a;
|
||||
border-bottom-color: #4a90d9;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.rt-picker-panel {
|
||||
max-height: 180px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.rt-picker-grid--palette {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 2px;
|
||||
}
|
||||
|
||||
.rt-picker-grid-row {
|
||||
display: flex;
|
||||
gap: 2px;
|
||||
}
|
||||
|
||||
.rt-picker-swatch {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
border-radius: 2px;
|
||||
border: 1px solid rgba(0, 0, 0, 0.1);
|
||||
cursor: pointer;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.rt-picker-swatch:hover {
|
||||
border-color: rgba(0, 0, 0, 0.4);
|
||||
transform: scale(1.2);
|
||||
z-index: 1;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.rt-picker-swatch--selected {
|
||||
border: 2px solid #1a1a1a;
|
||||
box-shadow: 0 0 0 1px white;
|
||||
}
|
||||
|
||||
.rt-picker-grid--named {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 4px;
|
||||
padding: 2px 0;
|
||||
}
|
||||
|
||||
.rt-picker-named-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
width: 40px;
|
||||
}
|
||||
|
||||
.rt-picker-named-item .rt-picker-swatch {
|
||||
width: 24px;
|
||||
height: 18px;
|
||||
}
|
||||
|
||||
.rt-picker-named-label {
|
||||
font-size: 8px;
|
||||
color: #888;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
width: 100%;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.rt-picker-panel--custom {
|
||||
max-height: none;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
.rt-picker-sv-wrap {
|
||||
position: relative;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
.rt-picker-sv {
|
||||
display: block;
|
||||
width: 100%;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 3px;
|
||||
cursor: crosshair;
|
||||
}
|
||||
|
||||
.rt-picker-sv-cursor {
|
||||
position: absolute;
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
border: 2px solid white;
|
||||
border-radius: 50%;
|
||||
box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
|
||||
pointer-events: none;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
|
||||
.rt-picker-hue {
|
||||
position: relative;
|
||||
height: 14px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 3px;
|
||||
background: linear-gradient(to right, #ff0000, #ffff00, #00ff00, #00ffff, #0000ff, #ff00ff, #ff0000);
|
||||
cursor: crosshair;
|
||||
}
|
||||
|
||||
.rt-picker-hue-indicator {
|
||||
position: absolute;
|
||||
top: -1px;
|
||||
width: 2px;
|
||||
height: calc(100% + 2px);
|
||||
background: white;
|
||||
box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
|
||||
pointer-events: none;
|
||||
transform: translateX(-50%);
|
||||
}
|
||||
|
||||
/* Picker dark mode */
|
||||
.rt-dark .rt-picker-tabs,
|
||||
.rt-color-popover.rt-dark .rt-picker-tabs {
|
||||
border-bottom-color: #555;
|
||||
}
|
||||
|
||||
.rt-dark .rt-picker-tab,
|
||||
.rt-color-popover.rt-dark .rt-picker-tab {
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.rt-dark .rt-picker-tab:hover,
|
||||
.rt-color-popover.rt-dark .rt-picker-tab:hover {
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
.rt-dark .rt-picker-tab--active,
|
||||
.rt-color-popover.rt-dark .rt-picker-tab--active {
|
||||
color: #e0e0e0;
|
||||
border-bottom-color: #4a90d9;
|
||||
}
|
||||
|
||||
.rt-dark .rt-picker-swatch,
|
||||
.rt-color-popover.rt-dark .rt-picker-swatch {
|
||||
border-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
.rt-dark .rt-picker-swatch:hover,
|
||||
.rt-color-popover.rt-dark .rt-picker-swatch:hover {
|
||||
border-color: rgba(255, 255, 255, 0.4);
|
||||
}
|
||||
|
||||
.rt-dark .rt-picker-swatch--selected,
|
||||
.rt-color-popover.rt-dark .rt-picker-swatch--selected {
|
||||
border-color: #e0e0e0;
|
||||
box-shadow: 0 0 0 1px #333;
|
||||
}
|
||||
|
||||
.rt-dark .rt-picker-named-label,
|
||||
.rt-color-popover.rt-dark .rt-picker-named-label {
|
||||
color: #777;
|
||||
}
|
||||
|
||||
.rt-dark .rt-picker-sv,
|
||||
.rt-color-popover.rt-dark .rt-picker-sv {
|
||||
border-color: #555;
|
||||
}
|
||||
|
||||
.rt-dark .rt-picker-hue,
|
||||
.rt-color-popover.rt-dark .rt-picker-hue {
|
||||
border-color: #555;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<link rel="stylesheet" href="popup.css">
|
||||
<link rel="stylesheet" href="../content/styles/color-picker.css">
|
||||
</head>
|
||||
<body>
|
||||
<div class="popup-container">
|
||||
@@ -118,6 +119,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<script src="../lib/settings.js"></script>
|
||||
<script src="../lib/presets.js"></script>
|
||||
<script src="../content/tweaks/color-picker.js"></script>
|
||||
<script src="popup.js"></script>
|
||||
</body>
|
||||
|
||||
185
popup/popup.js
185
popup/popup.js
@@ -4,6 +4,7 @@
|
||||
var picker = null;
|
||||
var activeSwatchEl = null;
|
||||
var saveDebounceTimer = null;
|
||||
var subredditEntries = [];
|
||||
|
||||
var COLOR_KEYS = [
|
||||
"light.subredditBgColor",
|
||||
@@ -20,11 +21,6 @@
|
||||
"dark.commentsTextColor",
|
||||
];
|
||||
|
||||
function colorToHex(val) {
|
||||
if (!val) return "#ffffff";
|
||||
return val;
|
||||
}
|
||||
|
||||
function getColorValue(el) {
|
||||
return el.dataset.value || "#ffffff";
|
||||
}
|
||||
@@ -78,7 +74,7 @@
|
||||
|
||||
COLOR_KEYS.forEach(function (key) {
|
||||
var el = document.getElementById(key);
|
||||
if (el) setColorValue(el, colorToHex(settings[key]));
|
||||
if (el) setColorValue(el, settings[key] || "#ffffff");
|
||||
});
|
||||
|
||||
renderSubredditOverrides(settings.subredditColors || {});
|
||||
@@ -87,6 +83,7 @@
|
||||
function renderSubredditOverrides(overrides) {
|
||||
var list = document.getElementById("subredditList");
|
||||
list.innerHTML = "";
|
||||
subredditEntries = [];
|
||||
|
||||
Object.entries(overrides).forEach(function (pair) {
|
||||
addSubredditEntry(pair[0], pair[1]);
|
||||
@@ -95,8 +92,8 @@
|
||||
|
||||
function addSubredditEntry(name, modeColors) {
|
||||
var list = document.getElementById("subredditList");
|
||||
var entry = document.createElement("div");
|
||||
entry.className = "subreddit-entry";
|
||||
var el = document.createElement("div");
|
||||
el.className = "subreddit-entry";
|
||||
|
||||
var header = document.createElement("div");
|
||||
header.className = "subreddit-entry-header";
|
||||
@@ -106,17 +103,7 @@
|
||||
nameInput.placeholder = "subreddit";
|
||||
nameInput.value = name || "";
|
||||
|
||||
var removeBtn = document.createElement("button");
|
||||
removeBtn.className = "btn-remove";
|
||||
removeBtn.textContent = "\u00d7";
|
||||
removeBtn.addEventListener("click", function () {
|
||||
closePicker();
|
||||
entry.remove();
|
||||
saveFromControls();
|
||||
});
|
||||
|
||||
header.appendChild(nameInput);
|
||||
header.appendChild(removeBtn);
|
||||
|
||||
var modeRow = document.createElement("div");
|
||||
modeRow.className = "subreddit-entry-mode";
|
||||
@@ -134,39 +121,59 @@
|
||||
|
||||
var bgSwatch = document.createElement("div");
|
||||
bgSwatch.className = "rt-color-swatch";
|
||||
setColorValue(bgSwatch, colorToHex(lightColors.bg));
|
||||
setColorValue(bgSwatch, lightColors.bg || "#ffffff");
|
||||
bgSwatch.title = "Background";
|
||||
|
||||
var borderSwatch = document.createElement("div");
|
||||
borderSwatch.className = "rt-color-swatch";
|
||||
setColorValue(borderSwatch, colorToHex(lightColors.border));
|
||||
setColorValue(borderSwatch, lightColors.border || "#ffffff");
|
||||
borderSwatch.title = "Border";
|
||||
|
||||
var textSwatch = document.createElement("div");
|
||||
textSwatch.className = "rt-color-swatch";
|
||||
setColorValue(textSwatch, colorToHex(lightColors.text));
|
||||
setColorValue(textSwatch, lightColors.text || "#ffffff");
|
||||
textSwatch.title = "Text";
|
||||
|
||||
colorsDiv.appendChild(bgSwatch);
|
||||
colorsDiv.appendChild(borderSwatch);
|
||||
colorsDiv.appendChild(textSwatch);
|
||||
|
||||
entry._colorState = {
|
||||
light: { bg: getColorValue(bgSwatch), border: getColorValue(borderSwatch), text: getColorValue(textSwatch) },
|
||||
dark: { bg: colorToHex(darkColors.bg), border: colorToHex(darkColors.border), text: colorToHex(darkColors.text) },
|
||||
var state = {
|
||||
nameInput: nameInput,
|
||||
bgSwatch: bgSwatch,
|
||||
borderSwatch: borderSwatch,
|
||||
textSwatch: textSwatch,
|
||||
modeSelect: modeSelect,
|
||||
colorState: {
|
||||
light: { bg: getColorValue(bgSwatch), border: getColorValue(borderSwatch), text: getColorValue(textSwatch) },
|
||||
dark: { bg: darkColors.bg || "#ffffff", border: darkColors.border || "#ffffff", text: darkColors.text || "#ffffff" },
|
||||
},
|
||||
hadOverride: {
|
||||
light: !!(modeColors && modeColors.light),
|
||||
dark: !!(modeColors && modeColors.dark),
|
||||
},
|
||||
dirtyModes: { light: false, dark: false },
|
||||
};
|
||||
entry._hadOverride = {
|
||||
light: !!(modeColors && modeColors.light),
|
||||
dark: !!(modeColors && modeColors.dark),
|
||||
};
|
||||
entry._dirtyModes = { light: false, dark: false };
|
||||
subredditEntries.push(state);
|
||||
|
||||
var removeBtn = document.createElement("button");
|
||||
removeBtn.className = "btn-remove";
|
||||
removeBtn.textContent = "\u00d7";
|
||||
removeBtn.addEventListener("click", function () {
|
||||
closePicker();
|
||||
var idx = subredditEntries.indexOf(state);
|
||||
if (idx !== -1) subredditEntries.splice(idx, 1);
|
||||
el.remove();
|
||||
saveFromControls();
|
||||
});
|
||||
header.appendChild(removeBtn);
|
||||
|
||||
modeSelect.addEventListener("change", function () {
|
||||
closePicker();
|
||||
var prev = modeSelect.value === "dark" ? "light" : "dark";
|
||||
entry._dirtyModes[prev] = true;
|
||||
entry._colorState[prev] = { bg: getColorValue(bgSwatch), border: getColorValue(borderSwatch), text: getColorValue(textSwatch) };
|
||||
var next = entry._colorState[modeSelect.value];
|
||||
state.dirtyModes[prev] = true;
|
||||
state.colorState[prev] = { bg: getColorValue(bgSwatch), border: getColorValue(borderSwatch), text: getColorValue(textSwatch) };
|
||||
var next = state.colorState[modeSelect.value];
|
||||
setColorValue(bgSwatch, next.bg);
|
||||
setColorValue(borderSwatch, next.border);
|
||||
setColorValue(textSwatch, next.text);
|
||||
@@ -175,7 +182,7 @@
|
||||
[bgSwatch, borderSwatch, textSwatch].forEach(function (swatch) {
|
||||
swatch.addEventListener("click", function () {
|
||||
openPickerForSwatch(swatch, function () {
|
||||
entry._dirtyModes[modeSelect.value] = true;
|
||||
state.dirtyModes[modeSelect.value] = true;
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -184,39 +191,32 @@
|
||||
saveFromControls();
|
||||
});
|
||||
|
||||
entry.appendChild(header);
|
||||
entry.appendChild(modeRow);
|
||||
entry.appendChild(colorsDiv);
|
||||
el.appendChild(header);
|
||||
el.appendChild(modeRow);
|
||||
el.appendChild(colorsDiv);
|
||||
|
||||
entry._nameInput = nameInput;
|
||||
entry._bgSwatch = bgSwatch;
|
||||
entry._borderSwatch = borderSwatch;
|
||||
entry._textSwatch = textSwatch;
|
||||
entry._modeSelect = modeSelect;
|
||||
|
||||
list.appendChild(entry);
|
||||
list.appendChild(el);
|
||||
}
|
||||
|
||||
function collectSubredditOverrides() {
|
||||
var overrides = {};
|
||||
var entries = document.querySelectorAll(".subreddit-entry");
|
||||
entries.forEach(function (entry) {
|
||||
var name = entry._nameInput.value.trim().replace(/^r\//, "");
|
||||
subredditEntries.forEach(function (state) {
|
||||
var name = state.nameInput.value.trim().replace(/^r\//, "");
|
||||
if (!name) return;
|
||||
|
||||
var currentMode = entry._modeSelect.value;
|
||||
entry._colorState[currentMode] = {
|
||||
bg: getColorValue(entry._bgSwatch),
|
||||
border: getColorValue(entry._borderSwatch),
|
||||
text: getColorValue(entry._textSwatch),
|
||||
var currentMode = state.modeSelect.value;
|
||||
state.colorState[currentMode] = {
|
||||
bg: getColorValue(state.bgSwatch),
|
||||
border: getColorValue(state.borderSwatch),
|
||||
text: getColorValue(state.textSwatch),
|
||||
};
|
||||
|
||||
var entryOverrides = {};
|
||||
if (entry._hadOverride.light || entry._dirtyModes.light) {
|
||||
entryOverrides.light = entry._colorState.light;
|
||||
if (state.hadOverride.light || state.dirtyModes.light) {
|
||||
entryOverrides.light = state.colorState.light;
|
||||
}
|
||||
if (entry._hadOverride.dark || entry._dirtyModes.dark) {
|
||||
entryOverrides.dark = entry._colorState.dark;
|
||||
if (state.hadOverride.dark || state.dirtyModes.dark) {
|
||||
entryOverrides.dark = state.colorState.dark;
|
||||
}
|
||||
|
||||
if (entryOverrides.light || entryOverrides.dark) {
|
||||
@@ -227,60 +227,31 @@
|
||||
}
|
||||
|
||||
function renderPopupPresets(presets) {
|
||||
var list = document.getElementById("presetList");
|
||||
list.innerHTML = "";
|
||||
for (var i = 0; i < presets.length; i++) {
|
||||
(function (index) {
|
||||
var p = presets[index];
|
||||
var badge = document.createElement("span");
|
||||
badge.className = "rt-preset-badge";
|
||||
badge.style.background = p.bg;
|
||||
badge.style.borderColor = p.border;
|
||||
badge.style.color = p.text;
|
||||
badge.textContent = "Aa";
|
||||
badge.title = "Click to apply to light subreddit colors";
|
||||
badge.addEventListener("click", function () {
|
||||
setColorValue(document.getElementById("light.subredditBgColor"), p.bg);
|
||||
setColorValue(document.getElementById("light.subredditBorderColor"), p.border);
|
||||
setColorValue(document.getElementById("light.subredditTextColor"), p.text);
|
||||
closePicker();
|
||||
saveFromControls();
|
||||
});
|
||||
|
||||
var del = document.createElement("span");
|
||||
del.className = "rt-preset-delete";
|
||||
del.textContent = "\u00d7";
|
||||
del.addEventListener("click", function (e) {
|
||||
e.stopPropagation();
|
||||
deletePopupPreset(index);
|
||||
});
|
||||
badge.appendChild(del);
|
||||
list.appendChild(badge);
|
||||
})(i);
|
||||
}
|
||||
window.RedditTweaks.presets.render(
|
||||
document.getElementById("presetList"),
|
||||
presets,
|
||||
function (p) {
|
||||
setColorValue(document.getElementById("light.subredditBgColor"), p.bg);
|
||||
setColorValue(document.getElementById("light.subredditBorderColor"), p.border);
|
||||
setColorValue(document.getElementById("light.subredditTextColor"), p.text);
|
||||
closePicker();
|
||||
saveFromControls();
|
||||
},
|
||||
function (index) {
|
||||
window.RedditTweaks.presets.delete(index, renderPopupPresets);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
async function addPopupPreset() {
|
||||
var preset = {
|
||||
bg: getColorValue(document.getElementById("light.subredditBgColor")),
|
||||
border: getColorValue(document.getElementById("light.subredditBorderColor")),
|
||||
text: getColorValue(document.getElementById("light.subredditTextColor")),
|
||||
};
|
||||
var settings = await window.RedditTweaks.loadSettings();
|
||||
var presets = settings.colorPresets || [];
|
||||
presets.push(preset);
|
||||
settings.colorPresets = presets;
|
||||
await window.RedditTweaks.saveSettings(settings);
|
||||
renderPopupPresets(presets);
|
||||
}
|
||||
|
||||
async function deletePopupPreset(index) {
|
||||
var settings = await window.RedditTweaks.loadSettings();
|
||||
var presets = settings.colorPresets || [];
|
||||
presets.splice(index, 1);
|
||||
settings.colorPresets = presets;
|
||||
await window.RedditTweaks.saveSettings(settings);
|
||||
renderPopupPresets(presets);
|
||||
function addPopupPreset() {
|
||||
window.RedditTweaks.presets.save(
|
||||
{
|
||||
bg: getColorValue(document.getElementById("light.subredditBgColor")),
|
||||
border: getColorValue(document.getElementById("light.subredditBorderColor")),
|
||||
text: getColorValue(document.getElementById("light.subredditTextColor")),
|
||||
},
|
||||
renderPopupPresets
|
||||
);
|
||||
}
|
||||
|
||||
async function saveFromControls() {
|
||||
|
||||
Reference in New Issue
Block a user