From: Dan Allen <dan@opendevise.com>
Date: Wed, 8 Apr 2020 07:22:13 +0000 (-0600)
Subject: use #with for simple template fragments guarded by truthy checks
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0986ee8ea622d6812a0cba12e1bcd07373cf7a32;p=working%2Feg-antora.git

use #with for simple template fragments guarded by truthy checks
---

diff --git a/src/partials/article.hbs b/src/partials/article.hbs
index 11a5117..edd5a08 100644
--- a/src/partials/article.hbs
+++ b/src/partials/article.hbs
@@ -9,9 +9,9 @@
 If you typed the URL of this page manually, please double check that you entered the address correctly.</p>
 </div>
 {{else}}
-{{#if page.title}}
-<h1 class="page">{{{page.title}}}</h1>
-{{/if}}
+{{#with page.title}}
+<h1 class="page">{{{this}}}</h1>
+{{/with}}
 {{{page.contents}}}
 {{/if}}
 </article>
diff --git a/src/partials/head-info.hbs b/src/partials/head-info.hbs
index 71012a1..bf1f19b 100644
--- a/src/partials/head-info.hbs
+++ b/src/partials/head-info.hbs
@@ -1,13 +1,13 @@
-    {{#if page.canonicalUrl}}
-    <link rel="canonical" href="{{page.canonicalUrl}}">
-    {{/if}}
+    {{#with page.canonicalUrl}}
+    <link rel="canonical" href="{{this}}">
+    {{/with}}
     {{#if page.component}}
-    {{#if page.description}}
-    <meta name="description" content="{{page.description}}">
-    {{/if}}
-    {{#if page.keywords}}
-    <meta name="keywords" content="{{page.keywords}}">
-    {{/if}}
+    {{#with page.description}}
+    <meta name="description" content="{{this}}">
+    {{/with}}
+    {{#with page.keywords}}
+    <meta name="keywords" content="{{this}}">
+    {{/with}}
     {{/if}}
     {{#with (or antoraVersion site.antoraVersion)}}
     <meta name="generator" content="Antora {{this}}">
diff --git a/src/partials/head-scripts.hbs b/src/partials/head-scripts.hbs
index 41ad69e..e7da2bb 100644
--- a/src/partials/head-scripts.hbs
+++ b/src/partials/head-scripts.hbs
@@ -1,4 +1,4 @@
-    {{#if site.keys.googleAnalytics}}
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{site.keys.googleAnalytics}}"></script>
-    <script>function gtag(){dataLayer.push(arguments)};window.dataLayer=window.dataLayer||[];gtag('js',new Date());gtag('config','{{site.keys.googleAnalytics}}')</script>
-    {{/if}}
+    {{#with site.keys.googleAnalytics}}
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{this}}"></script>
+    <script>function gtag(){dataLayer.push(arguments)};window.dataLayer=window.dataLayer||[];gtag('js',new Date());gtag('config','{{this}}')</script>
+    {{/with}}
diff --git a/src/partials/head-title.hbs b/src/partials/head-title.hbs
index c96c8f2..924fcac 100644
--- a/src/partials/head-title.hbs
+++ b/src/partials/head-title.hbs
@@ -1 +1 @@
-    <title>{{{detag (or page.title defaultPageTitle)}}}{{#if site.title}} :: {{site.title}}{{/if}}</title>
+    <title>{{{detag (or page.title defaultPageTitle)}}}{{#with site.title}} :: {{this}}{{/with}}</title>
diff --git a/src/partials/toolbar.hbs b/src/partials/toolbar.hbs
index 4e6f59b..dd4e3d7 100644
--- a/src/partials/toolbar.hbs
+++ b/src/partials/toolbar.hbs
@@ -1,8 +1,8 @@
 <div class="toolbar" role="navigation">
 {{> nav-toggle}}
-  {{#if site.homeUrl}}
-  <a href="{{relativize site.homeUrl}}" class="home-link{{#if page.home}} is-current{{/if}}"></a>
-  {{/if}}
+  {{#with site.homeUrl}}
+  <a href="{{relativize this}}" class="home-link{{#if @root.page.home}} is-current{{/if}}"></a>
+  {{/with}}
 {{> breadcrumbs}}
 {{> page-versions}}
   {{#if (and page.fileUri (not env.CI))}}