remove unnecessary regex, use encodeuri for label instead of replace

4 years ago · 9292de6333
parent a14d06aa3d
commit 9292de6333
5 changed files with 5 additions and 10 deletions
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@ -1,4 +1,5 @@
 {{$trimmed := strings.TrimSuffix ".md" (.Destination | safeURL)}}
+{{$trimmed = replace $trimmed "%20" "-"}}
 {{$external := strings.HasPrefix $trimmed "http" }}
 {{ if $external }}
 <a href="{{ $trimmed }}" rel="noopener">{{ .Text | safeHTML }}</a>
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@ -1,6 +1,3 @@
-{{$content := replaceRE `a href="\.\.\/(.+%20.+)+"` `$1` .Content}}
-{{$content = replace $content "%20" "-"}}
-{{$content = $content | safeHTML}}
 <!DOCTYPE html>
 <html lang="en">
 {{ partial "head.html" . }}
@ -22,7 +19,7 @@
            {{ .TableOfContents }}
        </aside>
        {{end}}
-        {{- $content -}}
+        {{.Content}}
    </article>
    {{partial "footer.html" .}}
 </div>
--- a/layouts/index.html
+++ b/layouts/index.html
@ -1,6 +1,3 @@
-{{$content := replaceRE `a href="\.\.\/(.+%20.+)+"` `$1` .Content}}
-{{$content = replace $content "%20" "-"}}
-{{$content = $content | safeHTML}}
 <!DOCTYPE html>
 <html lang="en">
 {{ partial "head.html" . }}
@ -22,7 +19,7 @@
            {{ .TableOfContents }}
        </aside>
        {{end}}
-        {{- $content -}}
+        {{- .Content -}}
    </article>
    {{partial "footer.html" .}}
 </div>
--- a/layouts/partials/backlinks.html
+++ b/layouts/partials/backlinks.html
@ -10,7 +10,7 @@
        {{$src = replace $src " " "-"}}

        <li>
-            <a href="{{$src | safeHTML}}">{{index . "source"}}</a>
+            <a href="{{$src}}">{{index . "source"}}</a>
        </li>
    {{- end -}}
    {{else}}
--- a/layouts/partials/graph.html
+++ b/layouts/partials/graph.html
@ -184,7 +184,7 @@
  const labels = graphNode.append("text")
    .attr("dx", 12)
    .attr("dy", ".35em")
-    .text((d) => d.id.replace("%20", " "))
+    .text((d) => encodeURI(d.id))
    .style("opacity", 0)
    .style("pointer-events", "none")
    .call(drag(simulation));