fix: Trim urls with strings.TrimRight

peaceiris · Jun 17, 2021 · 1162d72 · 1162d72
1 parent 64a8e1c
commit 1162d72
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/layouts/partials/edit-button.html b/layouts/partials/edit-button.html
@@ -1,5 +1,5 @@
 {{ with $.Site.Params.repo }}
-  <a class="button is-pulled-right" href="{{ .URL }}/edit/{{ .branch }}/{{ .contentDir }}/{{ $.Lang }}/{{ $.File.Path }}">
+  <a class="button is-pulled-right" href="{{ strings.TrimRight "/" .URL }}/edit/{{ .branch }}/{{ .contentDir }}/{{ $.Lang }}/{{ $.File.Path }}">
     {{ i18n "edit" }}
   </a>
 {{ end }}
diff --git a/layouts/partials/keyboard-shortcut.html b/layouts/partials/keyboard-shortcut.html
@@ -72,12 +72,12 @@
         break;
       {{ with $.Site.Params.repo }}
       case 'g+e':
-        window.open('{{ .URL }}/edit/{{ .branch }}/{{ .contentDir }}/{{ $.Lang }}/{{ $.File.Path }}', '_blank');
+        window.open('{{ strings.TrimRight "/" .URL }}/edit/{{ .branch }}/{{ .contentDir }}/{{ $.Lang }}/{{ $.File.Path }}', '_blank');
         break;
       {{ end }}
       {{ with $.Site.Params.repo }}
       case 'g+s':
-        window.open('{{ .URL }}/blob/{{ .branch }}/{{ .contentDir }}/{{ $.Lang }}/{{ $.File.Path }}', '_blank');
+        window.open('{{ strings.TrimRight "/" .URL }}/blob/{{ .branch }}/{{ .contentDir }}/{{ $.Lang }}/{{ $.File.Path }}', '_blank');
         break;
       {{ end }}
       case 'r':

diff --git a/layouts/partials/view-on-github-button.html b/layouts/partials/view-on-github-button.html
@@ -1,5 +1,5 @@
 {{ with $.Site.Params.repo }}
-  <a class="button is-pulled-right" href="{{ .URL }}/blob/{{ .branch }}/{{ .contentDir }}/{{ $.Lang }}/{{ $.File.Path }}">
+  <a class="button is-pulled-right" href="{{ strings.TrimRight "/" .URL }}/blob/{{ .branch }}/{{ .contentDir }}/{{ $.Lang }}/{{ $.File.Path }}">
     {{ i18n "view_on_github" }}
   </a>
 {{ end }}
diff --git a/layouts/robots.txt b/layouts/robots.txt
@@ -1,3 +1,3 @@
 User-agent: *
 
-Sitemap: {{ .Site.BaseURL }}sitemap.xml
+Sitemap: {{ strings.TrimRight "/" .Site.BaseURL }}/sitemap.xml