github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-23 06:01:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Comments: Added reference marker to comments
Some checks failed
lint-js / build (push) Has been cancelled
Details
lint-php / build (push) Has been cancelled
Details
test-js / build (push) Has been cancelled
Details
analyse-php / build (push) Has been cancelled
Details
test-migrations / build (8.2) (push) Has been cancelled
Details
test-migrations / build (8.3) (push) Has been cancelled
Details
test-migrations / build (8.4) (push) Has been cancelled
Details
test-php / build (8.2) (push) Has been cancelled
Details
test-php / build (8.3) (push) Has been cancelled
Details
test-php / build (8.4) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dan Brown
2025-04-26 21:05:54 +01:00
parent f656a82fe7
commit ecda4e1d6f
6 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
resources/js/components/page-comment.ts
View File

@ -5,6 +5,7 @@ import {el} from "../wysiwyg/utils/dom";
import commentIcon from "@icons/comment.svg"
import closeIcon from "@icons/close.svg"
import {PageDisplay} from "./page-display";
/**
* Track the close function for the current open marker so it can be closed
@ -35,6 +36,7 @@ export class PageComment extends Component {
protected deleteButton: HTMLElement;
protected replyButton: HTMLElement;
protected input: HTMLInputElement;
protected contentRefLink: HTMLLinkElement|null;
setup() {
// Options
@ -60,6 +62,7 @@ export class PageComment extends Component {
this.deleteButton = this.$refs.deleteButton;
this.replyButton = this.$refs.replyButton;
this.input = this.$refs.input as HTMLInputElement;
this.contentRefLink = (this.$refs.contentRef || null) as HTMLLinkElement|null;
this.setupListeners();
this.positionForReference();
@ -153,21 +156,20 @@ export class PageComment extends Component {
}
protected positionForReference() {
if (!this.commentContentRef) {
if (!this.commentContentRef || !this.contentRefLink) {
return;
}
const [refId, refHash, refRange] = this.commentContentRef.split(':');
const refEl = document.getElementById(refId);
if (!refEl) {
// TODO - Show outdated marker for comment
this.contentRefLink.classList.add('outdated', 'missing');
return;
}
const actualHash = hashElement(refEl);
if (actualHash !== refHash) {
// TODO - Show outdated marker for comment
return;
this.contentRefLink.classList.add('outdated');
}
const refElBounds = refEl.getBoundingClientRect();
@ -204,6 +206,13 @@ export class PageComment extends Component {
refEl.style.position = 'relative';
refEl.append(markerWrap);
this.contentRefLink.href = `#${refEl.id}`;
this.contentRefLink.addEventListener('click', (event: MouseEvent) => {
const pageDisplayComponent = window.$components.get('page-display')[0] as PageDisplay;
event.preventDefault();
pageDisplayComponent.goToText(refId);
});
}
protected showCommentAtMarker(marker: HTMLElement): void {

3
resources/js/components/page-display.js
View File

@ -57,6 +57,9 @@ export class PageDisplay extends Component {
}
}
/**
* @public
*/
goToText(text) {
const idElem = document.getElementById(text);