epub fixes, closes #2087

elixir-lang · Feb 2, 2025 · d0ea964 · d0ea964
1 parent 4f7580a
commit d0ea964
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 35 deletions.
diff --git a/assets/js/tooltips/tooltips.js b/assets/js/tooltips/tooltips.js
@@ -6,7 +6,7 @@ import tooltipBodyTemplate from '../handlebars/templates/tooltip-body.handlebars
 const TOOLTIP_HTML = '<div class="tooltip"><div class="tooltip-body"></div></div>'
 
 // Elements that can activate the tooltip.
-const TOOLTIP_ACTIVATORS_SELECTOR = '.content a:not([data-no-tooltip])'
+const TOOLTIP_ACTIVATORS_SELECTOR = '.content a:not([data-no-tooltip=""])'
 // Tooltip root element.
 const TOOLTIP_SELECTOR = '.tooltip'
 // Tooltip content element.

diff --git a/formatters/html/dist/html-NL4GMUWY.js → formatters/html/dist/html-6VTPNSGQ.js b/formatters/html/dist/html-NL4GMUWY.js → formatters/html/dist/html-6VTPNSGQ.js
diff --git a/lib/ex_doc/formatter/epub/templates.ex b/lib/ex_doc/formatter/epub/templates.ex
@@ -99,14 +99,6 @@ defmodule ExDoc.Formatter.EPUB.Templates do
     trim: true
   )
 
-  EEx.function_from_file(
-    :defp,
-    :nav_item_template,
-    Path.expand("templates/nav_item_template.eex", __DIR__),
-    [:name, :nodes],
-    trim: true
-  )
-
   EEx.function_from_file(
     :defp,
     :nav_grouped_item_template,

diff --git a/lib/ex_doc/formatter/epub/templates/nav_item_template.eex b/lib/ex_doc/formatter/epub/templates/nav_item_template.eex
diff --git a/lib/ex_doc/formatter/epub/templates/nav_template.eex b/lib/ex_doc/formatter/epub/templates/nav_template.eex
@@ -2,20 +2,25 @@
     <h1>Table of contents</h1>
     <nav epub:type="toc">
       <ol>
-        <%= nav_grouped_item_template config.extras  %>
+        <%= nav_grouped_item_template config.extras %>
 
-        <%= unless Enum.empty?(nodes.modules) do %>
+        <%= if nodes.modules != [] do %>
         <li>
-          <ol>
-            <li><span>Modules</span>
-              <ol>
-              <%= nav_grouped_item_template nodes.modules  %>
-              </ol>
-            </li>
-          </ol>
+          <span>Modules</span>
+          <ol><%= nav_grouped_item_template nodes.modules %></ol>
         </li>
         <% end %>
-        <%= nav_item_template "Mix Tasks", nodes.tasks %>
+
+        <%= if nodes.tasks != [] do %>
+          <li>
+            <span>Mix Tasks</span>
+            <ol>
+              <%= for node <- nodes.tasks do %>
+                <li><a href="<%= URI.encode node.id %>.xhtml"><%=h node.title %></a></li>
+              <% end %>
+            </ol>
+          </li>
+        <% end %>
       </ol>
     </nav>
     <%= before_closing_body_tag(config, :epub) %>

diff --git a/lib/ex_doc/formatter/html/templates/detail_template.eex b/lib/ex_doc/formatter/html/templates/detail_template.eex
@@ -3,7 +3,7 @@
     <span id="<%=enc "#{default_name}/#{default_arity}" %>"></span>
   <% end %>
   <div class="detail-header">
-    <a href="#<%=enc node.id %>" class="detail-link" data-no-tooltip aria-label="Link to this <%= pretty_type(node) %>">
+    <a href="#<%=enc node.id %>" class="detail-link" data-no-tooltip="" aria-label="Link to this <%= pretty_type(node) %>">
       <i class="ri-link-m" aria-hidden="true"></i>
     </a>
     <div class="heading-with-actions">

diff --git a/lib/ex_doc/formatter/html/templates/summary_template.eex b/lib/ex_doc/formatter/html/templates/summary_template.eex
@@ -5,7 +5,7 @@
   <%= for node <- nodes do %>
     <div class="summary-row">
       <div class="summary-signature">
-        <a href="#<%=enc node.id %>" data-no-tooltip translate="no"><%=h node.signature %></a>
+        <a href="#<%=enc node.id %>" data-no-tooltip="" translate="no"><%=h node.signature %></a>
         <%= if deprecated = node.deprecated do %>
           <span class="deprecated" title="<%= h(deprecated) %>">deprecated</span>
         <% end %>

diff --git a/test/ex_doc/formatter/epub/templates_test.exs b/test/ex_doc/formatter/epub/templates_test.exs
@@ -145,7 +145,7 @@ defmodule ExDoc.Formatter.EPUB.TemplatesTest do
       content = get_module_page([CompiledWithDocs])
 
       assert content =~
-               ~r{<div class="summary-signature">\s*<a href="#example_1/0" data-no-tooltip translate="no">}
+               ~r{<div class="summary-signature">\s*<a href="#example_1/0" data-no-tooltip="" translate="no">}
     end
 
     test "contains links to summary sections when those exist" do

diff --git a/test/ex_doc/formatter/html/templates_test.exs b/test/ex_doc/formatter/html/templates_test.exs
@@ -478,7 +478,7 @@ defmodule ExDoc.Formatter.HTML.TemplatesTest do
       assert content =~ ~s{example(foo, bar \\\\ Baz)}
 
       assert content =~
-               ~r{<a href="#example/2" class="detail-link" data-no-tooltip aria-label="Link to this function">\s*<i class="ri-link-m" aria-hidden="true"></i>\s*</a>}ms
+               ~r{<a href="#example/2" class="detail-link" data-no-tooltip="" aria-label="Link to this function">\s*<i class="ri-link-m" aria-hidden="true"></i>\s*</a>}ms
     end
 
     test "outputs function groups", context do
@@ -519,7 +519,7 @@ defmodule ExDoc.Formatter.HTML.TemplatesTest do
           ~S[<a href="TypesAndSpecs.Sub.html#t:t/0">TypesAndSpecs.Sub.t</a>(), ] <>
           ~S[<a href="#t:opaque/0">opaque</a>(), :ok | :error}]
 
-      assert content =~ ~s[<a href="#t:public/1" data-no-tooltip translate="no">public(t)</a>]
+      assert content =~ ~s[<a href="#t:public/1" data-no-tooltip="" translate="no">public(t)</a>]
       refute content =~ ~s[<a href="#t:private/0">private</a>]
       assert content =~ public_html
       refute content =~ ~s[<strong>private\(t\)]
@@ -538,7 +538,7 @@ defmodule ExDoc.Formatter.HTML.TemplatesTest do
       content = get_module_page([CompiledWithDocs], context)
 
       assert content =~
-               ~r{<div class="summary-signature">\s*<a href="#example_1/0" data-no-tooltip translate="no">}
+               ~r{<div class="summary-signature">\s*<a href="#example_1/0" data-no-tooltip="" translate="no">}
     end
 
     test "contains links to summary sections when those exist", context do