Merge pull request #20058 from calixteman/use_creationdate_popup

calixteman · web-flow · commit 729f2bb1489b · 2025-07-07T10:55:28.000+02:00
Use the creation date in the popup when there is no modification date
diff --git a/src/core/annotation.js b/src/core/annotation.js
@@ -3842,6 +3842,7 @@ class PopupAnnotation extends Annotation {
       return;
     }
     this.data.parentRect = lookupNormalRect(parentItem.getArray("Rect"), null);
+    this.data.creationDate = parentItem.get("CreationDate") || "";
 
     const rt = parentItem.get("RT");
     if (isName(rt, AnnotationReplyType.GROUP)) {
diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js
@@ -2071,7 +2071,7 @@ class PopupAnnotationElement extends AnnotationElement {
       container: this.container,
       color: this.data.color,
       titleObj: this.data.titleObj,
-      modificationDate: this.data.modificationDate,
+      modificationDate: this.data.modificationDate || this.data.creationDate,
       contentsObj: this.data.contentsObj,
       richText: this.data.richText,
       rect: this.data.rect,
@@ -2212,14 +2212,17 @@ class PopupElement {
 
     const header = document.createElement("span");
     header.className = "header";
-    const title = document.createElement("h1");
-    header.append(title);
-    ({ dir: title.dir, str: title.textContent } = this.#titleObj);
+    if (this.#titleObj?.str) {
+      const title = document.createElement("span");
+      title.className = "title";
+      header.append(title);
+      ({ dir: title.dir, str: title.textContent } = this.#titleObj);
+    }
     popup.append(header);
 
     if (this.#dateObj) {
       const modificationDate = document.createElement("time");
-      modificationDate.classList.add("popupDate");
+      modificationDate.className = "popupDate";
       modificationDate.setAttribute(
         "data-l10n-id",
         "pdfjs-annotation-date-time-string"
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -730,3 +730,4 @@
 !empty#hash.pdf
 !bug1885505.pdf
 !bug1974436.pdf
+!firefox_logo.pdf
diff --git a/test/pdfs/firefox_logo.pdf b/test/pdfs/firefox_logo.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -12156,5 +12156,13 @@
     "rounds": 1,
     "type": "eq",
     "annotations": true
+  },
+  {
+    "id": "firefox_logo",
+    "file": "pdfs/firefox_logo.pdf",
+    "md5": "e212e0cec3e39907950c597782a42c3a",
+    "rounds": 1,
+    "type": "eq",
+    "annotations": true
   }
 ]
diff --git a/web/annotation_layer_builder.css b/web/annotation_layer_builder.css
@@ -342,8 +342,9 @@
     display: inline-block;
   }
 
-  .popup > .header h1 {
+  .popup > .header > .title {
     display: inline;
+    font-weight: bold;
   }
 
   .popup > .header .popupDate {

Original file line number	Diff line number	Diff line change
`@@ -3842,6 +3842,7 @@ class PopupAnnotation extends Annotation {`
`3842`	`3842`	`return;`
`3843`	`3843`	`}`
`3844`	`3844`	`this.data.parentRect = lookupNormalRect(parentItem.getArray("Rect"), null);`
	`3845`	`+ this.data.creationDate = parentItem.get("CreationDate") \|\| "";`
`3845`	`3846`
`3846`	`3847`	`const rt = parentItem.get("RT");`
`3847`	`3848`	`if (isName(rt, AnnotationReplyType.GROUP)) {`
Original file line number	Diff line number	Diff line change
`@@ -12156,5 +12156,13 @@`
`12156`	`12156`	`"rounds": 1,`
`12157`	`12157`	`"type": "eq",`
`12158`	`12158`	`"annotations": true`
	`12159`	`+ },`
	`12160`	`+ {`
	`12161`	`+ "id": "firefox_logo",`
	`12162`	`+ "file": "pdfs/firefox_logo.pdf",`
	`12163`	`+ "md5": "e212e0cec3e39907950c597782a42c3a",`
	`12164`	`+ "rounds": 1,`
	`12165`	`+ "type": "eq",`
	`12166`	`+ "annotations": true`
`12159`	`12167`	`}`
`12160`	`12168`	`]`
Original file line number	Diff line number	Diff line change
`@@ -342,8 +342,9 @@`
`342`	`342`	`display: inline-block;`
`343`	`343`	`}`
`344`	`344`
`345`		`- .popup > .header h1 {`
	`345`	`+ .popup > .header > .title {`
`346`	`346`	`display: inline;`
	`347`	`+ font-weight: bold;`
`347`	`348`	`}`
`348`	`349`
`349`	`350`	`.popup > .header .popupDate {`