Merge branch 'page-margin-content' into toc-page-numbers

tc39 · Mar 12, 2024 · 136f8c2 · 136f8c2
2 parents 90bfaa1 + 9f7d351
commit 136f8c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/css/print.css b/css/print.css
diff --git a/js/menu.js b/js/menu.js
@@ -771,7 +771,9 @@ let referencePane = {
     this.$tableContainer.appendChild(this.$table);
     this.$pane.appendChild(this.$tableContainer);
 
-    menu.$specContainer.appendChild(this.$container);
+    if (menu != null) {
+      menu.$specContainer.appendChild(this.$container);
+    }
   },
 
   activate() {
@@ -1106,6 +1108,9 @@ function doShortcut(e) {
 }
 
 function init() {
+  if (document.getElementById('menu') == null) {
+    return;
+  }
   menu = new Menu();
   let $container = document.getElementById('spec-container');
   $container.addEventListener(

diff --git a/src/Spec.ts b/src/Spec.ts
@@ -1108,7 +1108,7 @@ ${await utils.readFile(path.join(__dirname, '../js/multipage.js'))}
       this.doc.head.appendChild(printStyle);
     }
     const currentYearStyle = this.doc.createElement('style');
-    currentYearStyle.textContent = `:root { --current-year: ${new Date().getFullYear()}; }`;
+    currentYearStyle.textContent = `:root { --current-year: ${this.opts.date!.getFullYear()}; }`;
     this.doc.head.appendChild(currentYearStyle);
     this.addStyle(
       this.doc.head,