Simplify the params needed by asset_rev

milmazz · milmazz · commit 62857dbb48fa · 2015-11-04T18:52:02.000-06:00
diff --git a/lib/ex_doc/formatter/html/templates.ex b/lib/ex_doc/formatter/html/templates.ex
@@ -161,6 +161,10 @@ defmodule ExDoc.Formatter.HTML.Templates do
   defp sidebar_type(:behaviour), do: "modules"
 
   defp asset_rev(output, pattern) do
+    output =
+      output
+      |> Path.expand()
+
     output
     |> Path.join(pattern)
     |> Path.wildcard()
diff --git a/lib/ex_doc/formatter/html/templates/footer_template.eex b/lib/ex_doc/formatter/html/templates/footer_template.eex
@@ -13,6 +13,6 @@
   </div>
 </section>
 </div>
-  <script src="<%= asset_rev Path.expand(config.output), "dist/app-*.js" %>"></script>
+  <script src="<%= asset_rev config.output, "dist/app-*.js" %>"></script>
   </body>
 </html>
diff --git a/lib/ex_doc/formatter/html/templates/head_template.eex b/lib/ex_doc/formatter/html/templates/head_template.eex
@@ -7,7 +7,7 @@
     <title><%= page.title %> – <%= config.project %> v<%= config.version %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="generator" content="ExDoc v<%= ExDoc.version %>">
-    <link rel="stylesheet" href="<%= asset_rev Path.expand(config.output), "dist/app-*.css" %>" />
+    <link rel="stylesheet" href="<%= asset_rev config.output, "dist/app-*.css" %>" />
     <script src="dist/sidebar_items.js"></script>
   </head>
   <body data-type="<%= sidebar_type(page.type) %>">
