Compare commits

..
Author SHA1 Message Date
Typosaurus c6b87b77bb ticket #99 attempt 1 2026-07-19 20:17:25 +00:00
10 changed files with 8 additions and 42 deletions
+2 -2
View File
@@ -258,13 +258,13 @@ class NotificationDefaultForm(BaseModel):
class AiCorrectionForm(BaseModel): class AiCorrectionForm(BaseModel):
enabled: bool = False enabled: bool = False
sync: bool = False sync: bool = False
prompt: str = Field(default=DEFAULT_CORRECTION_PROMPT, max_length=20000) prompt: str = Field(default=DEFAULT_CORRECTION_PROMPT)
class AiModifierForm(BaseModel): class AiModifierForm(BaseModel):
enabled: bool = False enabled: bool = False
sync: bool = False sync: bool = False
prompt: str = Field(default=DEFAULT_MODIFIER_PROMPT, max_length=20000) prompt: str = Field(default=DEFAULT_MODIFIER_PROMPT)
class InteractionsForm(BaseModel): class InteractionsForm(BaseModel):
@@ -61,7 +61,7 @@ AI_CORRECTION_ACTIONS: tuple[Action, ...] = (
), ),
arg( arg(
"prompt", "prompt",
"The correction instruction (max 20000 chars). Omit to keep the current one.", "The correction instruction. Omit to keep the current one.",
), ),
), ),
), ),
@@ -64,7 +64,7 @@ AI_MODIFIER_ACTIONS: tuple[Action, ...] = (
), ),
arg( arg(
"prompt", "prompt",
"The modifier instruction (max 20000 chars). Omit to keep the current one.", "The modifier instruction. Omit to keep the current one.",
), ),
), ),
), ),
@@ -70,7 +70,7 @@ class AiCorrectionController:
if prompt_raw is None: if prompt_raw is None:
prompt = user.get("ai_correction_prompt") or DEFAULT_CORRECTION_PROMPT prompt = user.get("ai_correction_prompt") or DEFAULT_CORRECTION_PROMPT
else: else:
prompt = str(prompt_raw).strip()[:20000] or DEFAULT_CORRECTION_PROMPT prompt = str(prompt_raw).strip() or DEFAULT_CORRECTION_PROMPT
get_table("users").update( get_table("users").update(
{ {
"uid": self._owner_id, "uid": self._owner_id,
@@ -70,7 +70,7 @@ class AiModifierController:
if prompt_raw is None: if prompt_raw is None:
prompt = user.get("ai_modifier_prompt") or DEFAULT_MODIFIER_PROMPT prompt = user.get("ai_modifier_prompt") or DEFAULT_MODIFIER_PROMPT
else: else:
prompt = str(prompt_raw).strip()[:20000] or DEFAULT_MODIFIER_PROMPT prompt = str(prompt_raw).strip() or DEFAULT_MODIFIER_PROMPT
get_table("users").update( get_table("users").update(
{ {
"uid": self._owner_id, "uid": self._owner_id,
-11
View File
@@ -29,7 +29,6 @@ export class ModalManager {
const modal = document.getElementById(modalId); const modal = document.getElementById(modalId);
if (modal) { if (modal) {
modal.classList.add("visible"); modal.classList.add("visible");
window.history.pushState({__overlay: true}, "");
} }
}); });
}); });
@@ -38,13 +37,11 @@ export class ModalManager {
modal.addEventListener("click", (e) => { modal.addEventListener("click", (e) => {
if (e.target === modal) { if (e.target === modal) {
modal.classList.remove("visible"); modal.classList.remove("visible");
window.history.back();
} }
}); });
modal.querySelectorAll(".modal-close").forEach((closeBtn) => { modal.querySelectorAll(".modal-close").forEach((closeBtn) => {
closeBtn.addEventListener("click", () => { closeBtn.addEventListener("click", () => {
modal.classList.remove("visible"); modal.classList.remove("visible");
window.history.back();
}); });
}); });
this.enhanceModal(modal); this.enhanceModal(modal);
@@ -53,14 +50,6 @@ export class ModalManager {
document.addEventListener("keydown", (e) => { document.addEventListener("keydown", (e) => {
if (e.key !== "Escape") return; if (e.key !== "Escape") return;
const open = [...document.querySelectorAll(".modal-overlay.visible")].pop(); const open = [...document.querySelectorAll(".modal-overlay.visible")].pop();
if (open) {
open.classList.remove("visible");
window.history.back();
}
});
window.addEventListener("popstate", () => {
const open = document.querySelector(".modal-overlay.visible");
if (open) open.classList.remove("visible"); if (open) open.classList.remove("visible");
}); });
} }
@@ -51,11 +51,6 @@ export class AppContextMenu extends Component {
document.addEventListener("keydown", (e) => { document.addEventListener("keydown", (e) => {
if (e.key === "Escape") this.close(); if (e.key === "Escape") this.close();
}); });
window.addEventListener("popstate", () => {
if (this.menu.classList.contains("visible")) {
this.menu.classList.remove("visible");
}
});
} }
render(items) { render(items) {
@@ -98,7 +93,6 @@ export class AppContextMenu extends Component {
if (!items || !items.length) return; if (!items || !items.length) return;
this.render(items); this.render(items);
this.menu.classList.add("visible"); this.menu.classList.add("visible");
window.history.pushState({__overlay: true}, "");
const rect = this.menu.getBoundingClientRect(); const rect = this.menu.getBoundingClientRect();
const vv = window.visualViewport; const vv = window.visualViewport;
const safeW = vv ? vv.width : window.innerWidth; const safeW = vv ? vv.width : window.innerWidth;
@@ -117,7 +111,6 @@ export class AppContextMenu extends Component {
close() { close() {
this.menu.classList.remove("visible"); this.menu.classList.remove("visible");
window.history.back();
} }
suppressNextClick() { suppressNextClick() {
@@ -64,11 +64,6 @@ export class AppDialog extends Component {
this.dismiss(); this.dismiss();
} }
}); });
window.addEventListener("popstate", () => {
if (this.overlay.classList.contains("visible")) {
this.overlay.classList.remove("visible");
}
});
overlay.addEventListener("keydown", (e) => { overlay.addEventListener("keydown", (e) => {
if (e.key !== "Tab") return; if (e.key !== "Tab") return;
const items = [ const items = [
@@ -112,7 +107,6 @@ export class AppDialog extends Component {
this.lastFocus = document.activeElement; this.lastFocus = document.activeElement;
this.overlay.classList.add("visible"); this.overlay.classList.add("visible");
window.history.pushState({__overlay: true}, "");
const focusTarget = mode === "prompt" ? this.input : this.confirmBtn; const focusTarget = mode === "prompt" ? this.input : this.confirmBtn;
setTimeout(() => { setTimeout(() => {
focusTarget.focus(); focusTarget.focus();
@@ -133,7 +127,6 @@ export class AppDialog extends Component {
close(value) { close(value) {
this.overlay.classList.remove("visible"); this.overlay.classList.remove("visible");
window.history.back();
if (this.lastFocus && this.lastFocus.focus) this.lastFocus.focus(); if (this.lastFocus && this.lastFocus.focus) this.lastFocus.focus();
const resolve = this.resolver; const resolve = this.resolver;
this.resolver = null; this.resolver = null;
@@ -54,7 +54,6 @@ export class AppLightbox extends Component {
this.close(); this.close();
} }
}); });
window.addEventListener("popstate", () => this._onPopstate());
this.overlay.addEventListener("keydown", (e) => { this.overlay.addEventListener("keydown", (e) => {
if (e.key === "Tab" && this.overlay.classList.contains("visible")) { if (e.key === "Tab" && this.overlay.classList.contains("visible")) {
e.preventDefault(); e.preventDefault();
@@ -78,23 +77,15 @@ export class AppLightbox extends Component {
this.bodyOverflow = document.body.style.overflow; this.bodyOverflow = document.body.style.overflow;
document.body.style.overflow = "hidden"; document.body.style.overflow = "hidden";
this.overlay.classList.add("visible"); this.overlay.classList.add("visible");
window.history.pushState({__overlay: true}, "");
setTimeout(() => this.closeBtn.focus(), 20); setTimeout(() => this.closeBtn.focus(), 20);
} }
close() { close() {
this.overlay.classList.remove("visible"); this.overlay.classList.remove("visible");
window.history.back();
this.image.src = ""; this.image.src = "";
document.body.style.overflow = this.bodyOverflow; document.body.style.overflow = this.bodyOverflow;
if (this.lastFocus && this.lastFocus.focus) this.lastFocus.focus(); if (this.lastFocus && this.lastFocus.focus) this.lastFocus.focus();
} }
_onPopstate() {
if (this.overlay.classList.contains("visible")) {
this.overlay.classList.remove("visible");
}
}
} }
customElements.define("dp-lightbox", AppLightbox); customElements.define("dp-lightbox", AppLightbox);
+2 -2
View File
@@ -226,7 +226,7 @@
<option value="sync" {% if ai_correction_sync %}selected{% endif %}>Synchronously (wait while saving)</option> <option value="sync" {% if ai_correction_sync %}selected{% endif %}>Synchronously (wait while saving)</option>
</select> </select>
</div> </div>
<textarea data-ai-correction-prompt class="input-sm ai-correction-prompt" maxlength="20000" rows="3" aria-label="AI content correction prompt">{{ ai_correction_prompt }}</textarea> <textarea data-ai-correction-prompt class="input-sm ai-correction-prompt" rows="3" aria-label="AI content correction prompt">{{ ai_correction_prompt }}</textarea>
<div class="customization-row"> <div class="customization-row">
<button type="button" class="btn btn-sm btn-primary" data-ai-correction-save>Save</button> <button type="button" class="btn btn-sm btn-primary" data-ai-correction-save>Save</button>
<span class="ai-correction-status" data-ai-correction-status role="status" aria-live="polite"></span> <span class="ai-correction-status" data-ai-correction-status role="status" aria-live="polite"></span>
@@ -251,7 +251,7 @@
<option value="sync" {% if ai_modifier_sync %}selected{% endif %}>Synchronously (wait while saving)</option> <option value="sync" {% if ai_modifier_sync %}selected{% endif %}>Synchronously (wait while saving)</option>
</select> </select>
</div> </div>
<textarea data-ai-modifier-prompt class="input-sm ai-correction-prompt" maxlength="20000" rows="3" aria-label="AI modifier prompt">{{ ai_modifier_prompt }}</textarea> <textarea data-ai-modifier-prompt class="input-sm ai-correction-prompt" rows="3" aria-label="AI modifier prompt">{{ ai_modifier_prompt }}</textarea>
<div class="customization-row"> <div class="customization-row">
<button type="button" class="btn btn-sm btn-primary" data-ai-modifier-save>Save</button> <button type="button" class="btn btn-sm btn-primary" data-ai-modifier-save>Save</button>
<span class="ai-correction-status" data-ai-modifier-status role="status" aria-live="polite"></span> <span class="ai-correction-status" data-ai-modifier-status role="status" aria-live="polite"></span>