Merge branch 'master' into clean_build

elias-sundqvist · Nov 27, 2022 · f4e4014 · f4e4014
2 parents 5d42ef5 + 2e1cc2e
commit f4e4014
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/annotatorView.tsx b/src/annotatorView.tsx
@@ -217,6 +217,7 @@ export default class AnnotatorView extends FileView {
         const annotation = await getAnnotation(annotationId, this.file, this.app.vault);
         if (!annotation) return;
         let yoffset = -10000;
+        let done = false;
         let newYOffset;
         const isPageNote = !annotation.target?.length;
         const selectors = new Set(isPageNote ? [] : annotation.target[0].selector.map(x => JSON.stringify(x)));
@@ -277,7 +278,6 @@ export default class AnnotatorView extends FileView {
                         'showAnnotations',
                         matchingAnchors.map(x => x.annotation.$tag)
                     );
-                    let done = false;
                     switch (annotationTargetType) {
                         case 'pdf':
                             for (const anchor of matchingAnchors) {

diff --git a/src/main.tsx b/src/main.tsx
@@ -389,8 +389,8 @@ export default class AnnotatorPlugin extends Plugin implements IHasAnnotatorSett
     private addMarkdownPostProcessor() {
         const markdownPostProcessor = async (el: HTMLElement, ctx: MarkdownPostProcessorContext) => {
             for (const link of el.getElementsByClassName('internal-link') as HTMLCollectionOf<HTMLAnchorElement>) {
-                const parsedLink = parseLinktext(link.getAttribute("href"));
-                const annotationid = parsedLink.subpath.startsWith('#^') ? parsedLink.subpath.substring(2) : null;
+                const parsedLink = parseLinktext(link.getAttribute("data-href"));
+                const annotationid = parsedLink.subpath.startsWith('#^') ? parsedLink.subpath.substr(2) : null;
                 const file: TFile | null = this.app.metadataCache.getFirstLinkpathDest(parsedLink.path, ctx.sourcePath);
 
                 if (this.isAnnotationFile(file)) {