Don’t emit empty target and rel values

quarto-dev · Aug 8, 2023 · 1748289 · 1748289
1 parent 7c88ea9
commit 1748289
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/resources/projects/website/templates/navitem-dropdown.ejs b/src/resources/projects/website/templates/navitem-dropdown.ejs
@@ -2,11 +2,11 @@
 
 <% if (item.href) { %>
   <li>
-    <a class="dropdown-item" href="<%- item.href %>" rel="<%- item.rel %>" target="<%- item.target %>"><% partial('navicon.ejs', { item }) %> <span class="dropdown-text"><%- item.text %></span></a>
+    <a class="dropdown-item" href="<%- item.href %>"<%- item.rel ? ` rel="${item.rel}"` : "" %><%- item.target ? ` target="${item.target}"` : "" %>><% partial('navicon.ejs', { item }) %> <span class="dropdown-text"><%- item.text %></span></a>
   </li>  
 <% } else if (item.menu) { %>
   <li class="dropdown">
-    <a class="dropdown-toggle" href="#" id="<%- item.id %>" role="button" data-bs-toggle="dropdown" aria-expanded="false" rel="<%= item.rel %>" target="<% item.target %>">
+    <a class="dropdown-toggle" href="#" id="<%- item.id %>" role="button" data-bs-toggle="dropdown" aria-expanded="false"<%- item.rel ? ` rel="${item.rel}"` : "" %><%- item.target ? ` target="${item.target}"` : "" %>>
       <% partial('navicon.ejs', { item }) %> <%- item.text %>
     </a>
     <ul class="dropdown-menu" aria-labelledby="<%- item.id %>">    

diff --git a/src/resources/projects/website/templates/navitem.ejs b/src/resources/projects/website/templates/navitem.ejs
@@ -2,11 +2,11 @@
 
 <% if (item.href) { %>
   <li class="nav-item<%- item.text === undefined ? ' compact' : '' %>">
-    <a class="nav-link" href="<%- item.href %>" rel="<%- item.rel %>" target="<%- item.target %>"><% partial('navicon.ejs', { item }) %> <span class="menu-text"><%- item.text %></span></a>
+    <a class="nav-link" href="<%- item.href %>"<%- item.rel ? ` rel="${item.rel}"` : "" %><%- item.target ? ` target="${item.target}"` : "" %> <% partial('navicon.ejs', { item }) %>><span class="menu-text"><%- item.text %></span></a>
   </li>  
 <% } else if (item.menu) { %>
   <li class="nav-item dropdown <%- item.text === undefined ? ' compact' : '' %>">
-    <a class="nav-link dropdown-toggle" href="#" id="<%- item.id %>" role="button" data-bs-toggle="dropdown" aria-expanded="false" rel="<%= item.rel %>" target="<%= item.target %>">
+    <a class="nav-link dropdown-toggle" href="#" id="<%- item.id %>" role="button" data-bs-toggle="dropdown" aria-expanded="false" <%- item.rel ? ` rel="${item.rel}"` : "" %><%- item.target ? ` target="${item.target}"` : "" %>>
       <% partial('navicon.ejs', { item }) %> <span class="menu-text"><%- item.text %></span>
     </a>
     <ul class="dropdown-menu<%- align === 'end' ? ' dropdown-menu-end' : ''%>" aria-labelledby="<%- item.id %>">    

diff --git a/src/resources/projects/website/templates/navtools.ejs b/src/resources/projects/website/templates/navtools.ejs
@@ -41,7 +41,7 @@ const isWide = toolCount > 2; %>
       </ul>
     </div>
   <% } else { %>
-    <a href="<%- tool.href %>" rel="<%- tool.rel %>" title="<%- tool.text %>" class="quarto-navigation-tool px-1" aria-label="<%- tool['aria-label'] || tool.text %>"><i class="bi bi-<%- tool.icon %>"></i></a>
+    <a href="<%- tool.href %>" <%- tool.rel ? `rel="${tool.rel}"` : "" %> title="<%- tool.text %>" class="quarto-navigation-tool px-1" aria-label="<%- tool['aria-label'] || tool.text %>"><i class="bi bi-<%- tool.icon %>"></i></a>
   <% } %>
 <% }) %>