Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions public/icons/services/openweather-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/icons/services/openweather-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/js/admin-app-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import {
reveal,
setTogDisabled,
swapContent,
} from '/js/admin-shared.js?v=5cf446fa';
} from '/js/admin-shared.js?v=fd784739';
import { createListbox } from '/js/listbox.js?v=a67e9c98';
import { MAX_LABELS } from '/js/badge-logic.js?v=b3c8b6c2';
import { renderColorControl, BADGE_SWATCHES, BADGE_DEFAULT } from '/js/admin-color-control.js?v=47d9d808';
import { renderColorControl, BADGE_SWATCHES, BADGE_DEFAULT } from '/js/admin-color-control.js?v=837961fa';
import { badgeErrorAdvice, TONE } from '/js/admin-error.js?v=10f3cdb1';
import { fluidHoverClear, fluidHoverKb } from '/js/fluid-hover.js?v=cb886e86';

Expand Down
2 changes: 1 addition & 1 deletion public/js/admin-auth.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ag, ap } from '/js/admin-shared.js?v=5cf446fa';
import { ag, ap } from '/js/admin-shared.js?v=fd784739';
import { t } from '/js/i18n.js?v=1f1ea9c1';
import { pwStrength } from '/js/password-strength.js?v=42f45ac7';
import { el, inp as inpById, qa } from '/js/utils.js?v=70cbc405';
Expand Down
2 changes: 1 addition & 1 deletion public/js/admin-color-control.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PE_SVG, initInlineEdit, toast, reveal } from '/js/admin-shared.js?v=5cf446fa';
import { PE_SVG, initInlineEdit, toast, reveal } from '/js/admin-shared.js?v=fd784739';
import { t } from '/js/i18n.js?v=1f1ea9c1';
import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
import { qa, q } from '/js/utils.js?v=70cbc405';
Expand Down
4 changes: 2 additions & 2 deletions public/js/admin-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import { collapsedFolders, filter, state } from '/js/admin-state.js?v=5a5d655f';
import { snapshotItems } from '/js/admin-save-logic.js?v=4f71ef6c';
import { reorderItems } from '/js/admin-logic.js?v=69e57d35';
import { initDrag, wireRowDrag } from '/js/admin-drag.js?v=85ce4de5';
import { paintIcon } from '/js/admin-shared.js?v=5cf446fa';
import { paintIcon } from '/js/admin-shared.js?v=fd784739';
import { clr as rc, el, qa, setUserText } from '/js/utils.js?v=70cbc405';
import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
import { t } from '/js/i18n.js?v=1f1ea9c1';
import { sizeLabel } from '/js/admin-widget-form.js?v=6c778690';
import { sizeLabel } from '/js/admin-widget-form.js?v=3b1b3546';
import { widgetGlyph } from '/js/widget-glyphs.js?v=12b0a947';

/** @type {{ openModal: (idx: number|null) => void,
Expand Down
2 changes: 1 addition & 1 deletion public/js/admin-settings.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { toast, ag, ap, reveal, swapContent } from '/js/admin-shared.js?v=5cf446fa';
import { toast, ag, ap, reveal, swapContent } from '/js/admin-shared.js?v=fd784739';
import { pwStrength } from '/js/password-strength.js?v=42f45ac7';
import { t } from '/js/i18n.js?v=1f1ea9c1';
import {
Expand Down
24 changes: 19 additions & 5 deletions public/js/admin-shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,21 @@ export const PE_SVG =
@param {{ type?: string, placeholder?: string | (() => string),
onCommit?: (value: string) => void, root?: ParentNode }} [opts] */
export function initInlineEdit(rowId, inputId, { type = 'text', placeholder = '', onCommit, root = document } = {}) {
const ph = () => (typeof placeholder === 'function' ? placeholder() : placeholder);
const byId = id => (root === document ? el(id) : root.querySelector('#' + CSS.escape(id)));
const row = byId(rowId);
const row = /** @type {HTMLElement} */ (byId(rowId));
const inp = /** @type {HTMLInputElement} */ (byId(inputId));
if (!row || !inp) return;
wireInlineEdit(row, inp, { type, placeholder, onCommit });
}

/** The same row behaviour for elements a caller already holds. `row` needs an id.
`fill: false` keeps the input's own value on open. `render` replaces how the
committed value is shown.
@param {HTMLElement} row @param {HTMLInputElement} inp
@param {{ type?: string, placeholder?: string | (() => string), onCommit?: (value: string) => void,
fill?: boolean, render?: (valEl: Element, value: string) => void }} [opts] */
export function wireInlineEdit(row, inp, { type = 'text', placeholder = '', onCommit, fill = true, render } = {}) {
const ph = () => (typeof placeholder === 'function' ? placeholder() : placeholder);
const valEl = q('.rv', row);
const pen = q('.pe', row);
if (!valEl || !pen) return;
Expand All @@ -227,7 +237,7 @@ export function initInlineEdit(rowId, inputId, { type = 'text', placeholder = ''
name, and several readers drop it once the field holds a value. */
const labelEl = q('.rl', row);
if (labelEl) {
if (!labelEl.id) labelEl.id = `${rowId}-rl`;
if (!labelEl.id) labelEl.id = `${row.id}-rl`;
inp.setAttribute('aria-labelledby', labelEl.id);
/* The pencil opens this row, so it is named after this row. Taking the name
from the label keeps the two in one language, and in step when either
Expand All @@ -236,19 +246,22 @@ export function initInlineEdit(rowId, inputId, { type = 'text', placeholder = ''
}
row.insertBefore(inp, pen);

let before = '';
function open() {
if (row.classList.contains('editing')) return;
row.classList.add('editing');
inp.placeholder = ph();
inp.value = valEl.classList.contains('is-ph') ? '' : valEl.textContent;
if (fill) inp.value = valEl.classList.contains('is-ph') ? '' : valEl.textContent;
before = inp.value;
inp.focus();
inp.select?.();
}
function commit() {
if (!row.classList.contains('editing')) return;
row.classList.remove('editing');
const v = inp.value.trim();
if (v) {
if (render) render(valEl, v);
else if (v) {
valEl.textContent = v;
valEl.classList.remove('is-ph');
} else {
Expand All @@ -270,6 +283,7 @@ export function initInlineEdit(rowId, inputId, { type = 'text', placeholder = ''
}
if (e.key === 'Escape') {
e.preventDefault();
inp.value = before;
row.classList.remove('editing');
}
},
Expand Down
4 changes: 2 additions & 2 deletions public/js/admin-widget-form.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { state } from '/js/admin-state.js?v=5a5d655f';
import { PE_SVG, initInlineEdit, swapContent } from '/js/admin-shared.js?v=5cf446fa';
import { PE_SVG, initInlineEdit, swapContent } from '/js/admin-shared.js?v=fd784739';
import { createListbox } from '/js/listbox.js?v=a67e9c98';
import { renderWidgetConfigForm } from '/js/widget-config-form.js?v=785f41f6';
import { renderWidgetConfigForm } from '/js/widget-config-form.js?v=ad9e05ee';
import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
import { sizesForView, widgetConfigMode, rejectionLines, carriesTypedValues } from '/js/admin-logic.js?v=69e57d35';
import { t } from '/js/i18n.js?v=1f1ea9c1';
Expand Down
14 changes: 7 additions & 7 deletions public/js/admin.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { buildAppForm, buildFolderForm, captureActLabels, serializeKvRows } from '/js/admin-app-form.js?v=0ed92d16';
import { checkAuth, requireLogin, wirePasswordStrength } from '/js/admin-auth.js?v=8f4673da';
import { initList, render, syncFilterUI } from '/js/admin-list.js?v=d0669049';
import { buildAppForm, buildFolderForm, captureActLabels, serializeKvRows } from '/js/admin-app-form.js?v=a53ac0e8';
import { checkAuth, requireLogin, wirePasswordStrength } from '/js/admin-auth.js?v=c70fb722';
import { initList, render, syncFilterUI } from '/js/admin-list.js?v=b0923a32';
import { resolveAdminSection } from '/js/admin-logic.js?v=69e57d35';
import {
buildAppItem,
Expand All @@ -10,10 +10,10 @@ import {
snapshotItems,
upsertItem,
} from '/js/admin-save-logic.js?v=4f71ef6c';
import { loadSettings, settingsDirty, showBgFields, showWallpaperFile } from '/js/admin-settings.js?v=81778efd';
import { ag, ap, initInlineEdit, paintIcon, reveal, setReauthHandler, toast } from '/js/admin-shared.js?v=5cf446fa';
import { loadSettings, settingsDirty, showBgFields, showWallpaperFile } from '/js/admin-settings.js?v=079a3d2d';
import { ag, ap, initInlineEdit, paintIcon, reveal, setReauthHandler, toast } from '/js/admin-shared.js?v=fd784739';
import { collapsedFolders, filter, state } from '/js/admin-state.js?v=5a5d655f';
import { buildWidgetForm } from '/js/admin-widget-form.js?v=6c778690';
import { buildWidgetForm } from '/js/admin-widget-form.js?v=3b1b3546';
import { initFluidHover } from '/js/fluid-hover.js?v=cb886e86';
import { initGlideSelect, syncGlideSelect } from '/js/glide-select.js?v=8b39e9d0';
import { createListbox } from '/js/listbox.js?v=a67e9c98';
Expand All @@ -33,7 +33,7 @@ import { isMobileLayout, onLayoutChange } from '/js/layout.js?v=e9f4b607';
import { confirmModal, confirmText, openModal as openDialog, promptModal } from '/js/modal.js?v=11fa1eff';
import { readMode, watchSystemTheme, writeMode } from '/js/theme.js?v=787bfdff';
import { el, inp, q, qa, clr as rc, sanitizeCssUrl, setUserText, tgt } from '/js/utils.js?v=70cbc405';
import { normalizeColorInput } from '/js/admin-color-control.js?v=47d9d808';
import { normalizeColorInput } from '/js/admin-color-control.js?v=837961fa';
import { parseYamlTolerant, YamlLiteError } from '/js/yaml-lite.js?v=6ebb564c';
import { loadWallpaper, saveWallpaper } from '/js/wallpaper-cache.js?v=c5f8a3e6';

Expand Down
75 changes: 20 additions & 55 deletions public/js/widget-config-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

import { t } from '/js/i18n.js?v=1f1ea9c1';
import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
import { reveal } from '/js/admin-shared.js?v=5cf446fa';
import { reveal, wireInlineEdit } from '/js/admin-shared.js?v=fd784739';
import { createListbox } from '/js/listbox.js?v=a67e9c98';
import { renderColorControl } from '/js/admin-color-control.js?v=47d9d808';
import { renderColorControl } from '/js/admin-color-control.js?v=837961fa';
import {
seedCarried,
applyOptionSet,
Expand Down Expand Up @@ -36,40 +36,17 @@ function _ieRow(field, value, inputType) {
const ph = field.placeholder || '';
const row = document.createElement('div');
row.className = 'row ie-row';
row.id = uniqueId('wcf-ie');
setHtml(
row,
html`<span class="rl">${field.label}${_tag(field)}</span><span class="rv${has ? '' : ' is-ph'}">${has ? value : ph}</span><input class="row-inp d-none" type="${inputType}" autocomplete="off" value="${has ? value : field.default != null ? field.default : ''}"><button class="pe" type="button" aria-label="${t('common.editNamed', { name: field.label })}">${raw(PE)}</button>`,
);
const rv = row.querySelector('.rv'),
inp = qi('.row-inp', row),
pe = row.querySelector('.pe');
function open() {
row.classList.add('editing');
inp.style.display = 'block';
inp.focus();
inp.select?.();
}
function commit() {
row.classList.remove('editing');
inp.style.display = 'none';
const v = inp.value.trim();
if (v) {
rv.textContent = v;
rv.classList.remove('is-ph');
} else {
rv.textContent = ph;
rv.classList.add('is-ph');
}
inp.dispatchEvent(new Event('change', { bubbles: true }));
}
pe.addEventListener('click', open);
rv.addEventListener('click', open);
inp.addEventListener('blur', commit);
inp.addEventListener('keydown', e => {
if (e.key === 'Enter') {
e.preventDefault();
inp.blur();
}
const inp = qi('.row-inp', row);
wireInlineEdit(row, inp, {
type: inputType,
placeholder: ph,
fill: false,
onCommit: () => inp.dispatchEvent(new Event('change', { bubbles: true })),
});
const get = () => {
const v = inp.value.trim();
Expand All @@ -96,33 +73,21 @@ function _ieRow(field, value, inputType) {
function _secret(field, isSet) {
const row = document.createElement('div');
row.className = 'row ie-row';
row.id = uniqueId('wcf-secret');
const display = isSet ? t('common.configured') : t('common.notSet');
setHtml(
row,
html`<span class="rl">${field.label}${_tag(field)}</span><span class="rv is-ph">${display}</span><input class="row-inp d-none" type="password" autocomplete="new-password" placeholder="${isSet ? t('widgetCfg.replaceSecret') : field.placeholder || ''}"><button class="pe" type="button" aria-label="${t('common.editNamed', { name: field.label })}">${raw(PE)}</button>`,
html`<span class="rl">${field.label}${_tag(field)}</span><span class="rv is-ph">${display}</span><input class="row-inp d-none" type="password" autocomplete="new-password"><button class="pe" type="button" aria-label="${t('common.editNamed', { name: field.label })}">${raw(PE)}</button>`,
);
const rv = row.querySelector('.rv'),
inp = qi('.row-inp', row),
pe = row.querySelector('.pe');
const open = () => {
row.classList.add('editing');
inp.style.display = 'block';
inp.focus();
};
const commit = () => {
row.classList.remove('editing');
inp.style.display = 'none';
rv.textContent = inp.value ? t('widgetCfg.newValueSet') : display;
inp.dispatchEvent(new Event('change', { bubbles: true }));
};
pe.addEventListener('click', open);
rv.addEventListener('click', open);
inp.addEventListener('blur', commit);
inp.addEventListener('keydown', e => {
if (e.key === 'Enter') {
e.preventDefault();
inp.blur();
}
const inp = qi('.row-inp', row);
wireInlineEdit(row, inp, {
type: 'password',
placeholder: isSet ? t('widgetCfg.replaceSecret') : field.placeholder || '',
fill: false,
render: (valEl, v) => {
valEl.textContent = v ? t('widgetCfg.newValueSet') : display;
},
onCommit: () => inp.dispatchEvent(new Event('change', { bubbles: true })),
});
const get = () => {
const v = inp.value.trim();
Expand Down
Loading