Merge pull request #12524 from Snuffleupagus/pr-12333-followup

A couple of small (viewer) tweaks of tooltip-only Annotations (PR 12333 follow-up)
mozilla · Oct 24, 2020 · da73537 · da73537
2 parents 180f35e + 9f8d980
commit da73537
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js
@@ -348,7 +348,7 @@ class LinkAnnotationElement extends AnnotationElement {
       }
       return false;
     };
-    if (destination) {
+    if (destination || destination === /* isTooltipOnly = */ "") {
       link.className = "internalLink";
     }
   }

diff --git a/web/pdf_link_service.js b/web/pdf_link_service.js
@@ -235,19 +235,22 @@ class PDFLinkService {
    */
   getDestinationHash(dest) {
     if (typeof dest === "string") {
-      return this.getAnchorUrl("#" + escape(dest));
-    }
-    if (Array.isArray(dest)) {
+      if (dest.length > 0) {
+        return this.getAnchorUrl("#" + escape(dest));
+      }
+    } else if (Array.isArray(dest)) {
       const str = JSON.stringify(dest);
-      return this.getAnchorUrl("#" + escape(str));
+      if (str.length > 0) {
+        return this.getAnchorUrl("#" + escape(str));
+      }
     }
     return this.getAnchorUrl("");
   }
 
   /**
    * Prefix the full url on anchor links to make sure that links are resolved
    * relative to the current URL instead of the one defined in <base href>.
-   * @param {string} anchor The anchor hash, including the #.
+   * @param {string} anchor - The anchor hash, including the #.
    * @returns {string} The hyperlink to the PDF object.
    */
   getAnchorUrl(anchor) {