projects / working / eg-antora.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bff8913)
don't assume page.title is set in template
authorDan Allen <dan@opendevise.com>
Mon, 5 Feb 2018 00:03:44 +0000 (17:03 -0700)
committerDan Allen <dan@opendevise.com>
Mon, 5 Feb 2018 00:08:27 +0000 (17:08 -0700)
src/helpers/detag.js patch | blob | history
src/layouts/404.hbs patch | blob | history
src/layouts/default.hbs patch | blob | history
src/partials/article.hbs patch | blob | history

diff --git a/src/helpers/detag.js b/src/helpers/detag.js
index 6230d67..ca283a2 100644 (file)
--- a/src/helpers/detag.js
+++ b/src/helpers/detag.js
@@ -1,4 +1,4 @@
 'use strict'
 
 const TAG_ALL_RX = /<[^>]+>/g
-module.exports = (html) => html.replace(TAG_ALL_RX, '')
+module.exports = (html) => html && html.replace(TAG_ALL_RX, '')
diff --git a/src/layouts/404.hbs b/src/layouts/404.hbs
index 1faa906..56405ac 100644 (file)
--- a/src/layouts/404.hbs
+++ b/src/layouts/404.hbs
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{detag page.title}}{{#if site.title}} :: {{site.title}}{{/if}}</title>
+    <title>{{detag (or page.title 'Page Not Found')}}{{#if site.title}} :: {{site.title}}{{/if}}</title>
     <link rel="stylesheet" href="{{uiRootPath}}/css/site.css">
 {{> head}}
   </head>
diff --git a/src/layouts/default.hbs b/src/layouts/default.hbs
index 02abf47..850a3b2 100644 (file)
--- a/src/layouts/default.hbs
+++ b/src/layouts/default.hbs
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{detag page.title}}{{#if site.title}} :: {{site.title}}{{/if}}</title>
+    <title>{{detag (or page.title 'Untitled')}}{{#if site.title}} :: {{site.title}}{{/if}}</title>
     {{#if page.canonicalUrl}}
     <link rel="canonical" href="{{page.canonicalUrl}}">
     {{/if}}
diff --git a/src/partials/article.hbs b/src/partials/article.hbs
index cb552ba..a4c23a0 100644 (file)
--- a/src/partials/article.hbs
+++ b/src/partials/article.hbs
@@ -1,4 +1,6 @@
 <article class="doc">
+{{#if page.title}}
 <h1>{{{page.title}}}</h1>
+{{/if}}
 {{{page.contents}}}
 </article>
Evergreen Antora