Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include user styles in note editor #1049

Closed
wants to merge 1 commit into from
Closed

Include user styles in note editor #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion qt/aqt/editor.py
View file
Open in desktop
Expand Up @@ -509,9 +509,10 @@ def oncallback(arg: Any) -> None:
self.web.setFocus()
gui_hooks.editor_did_load_note(self)

js = "setFields(%s); setFonts(%s); focusField(%s); setNoteId(%s);" % (
js = "setFields(%s); setFonts(%s); setUserStyling(%s); focusField(%s); setNoteId(%s);" % (
json.dumps(data),
json.dumps(self.fonts()),
json.dumps(self.note.model()["css"]),
json.dumps(focusTo),
json.dumps(self.note.id),
)
Expand Down
25 changes: 25 additions & 0 deletions ts/editor/index.ts
View file
Open in desktop
Expand Up @@ -111,6 +111,7 @@ customElements.define("anki-editable", Editable);
export class EditingArea extends HTMLDivElement {
editable: Editable;
baseStyle: HTMLStyleElement;
userStyle: HTMLStyleElement;

constructor() {
super();
Expand All @@ -126,6 +127,10 @@ export class EditingArea extends HTMLDivElement {
this.baseStyle.setAttribute("rel", "stylesheet");
this.shadowRoot!.appendChild(this.baseStyle);

this.userStyle = document.createElement("style");
this.userStyle.setAttribute("rel", "stylesheet");
this.shadowRoot!.appendChild(this.userStyle);

this.editable = document.createElement("anki-editable") as Editable;
this.shadowRoot!.appendChild(this.editable);
}
Expand Down Expand Up @@ -188,6 +193,11 @@ export class EditingArea extends HTMLDivElement {
firstRule.style.direction = direction;
}

setUserStyling(style: HTMLStyleElement): void {
this.userStyle.parentNode.replaceChild(style, this.userStyle);
this.userStyle = style;
}

isRightToLeft(): boolean {
return this.editable.style.direction === "rtl";
}
Expand Down Expand Up @@ -232,6 +242,7 @@ export class EditorField extends HTMLDivElement {
return ["ord"];
}


set ord(n: number) {
this.setAttribute("ord", String(n));
}
Expand All @@ -251,6 +262,10 @@ export class EditorField extends HTMLDivElement {
setBaseStyling(fontFamily: string, fontSize: string, direction: string): void {
this.editingArea.setBaseStyling(fontFamily, fontSize, direction);
}

setUserStyling(style: HTMLStyleElement): void {
this.editingArea.setUserStyling(style);
}
}

customElements.define("anki-editor-field", EditorField, { extends: "div" });
Expand Down Expand Up @@ -315,6 +330,16 @@ export function setFonts(fonts: [string, number, boolean][]): void {
});
}

export function setUserStyling(css: string): void {
const userStyle = document.createElement("style");
userStyle.setAttribute("rel", "stylesheet");
userStyle.innerText = css;

forEditorField([], (field) => {
field.setUserStyling(userStyle.cloneNode(true) as HTMLStyleElement);
});
}

export function setFormat(cmd: string, arg?: any, nosave: boolean = false): void {
document.execCommand(cmd, false, arg);
if (!nosave) {
Expand Down