8000 Merge pull request #163 from daviddarnes/fix-relative-paths · CreaHtive/CreaHtive.github.io@f73de31 · GitHub
[go: up one dir, main page]
Skip to content

Commit f73de31

Browse files
daviddarnesdaviddarnes
authored
Merge pull request daviddarnes#163 from daviddarnes/fix-relative-paths
[Fix] Service worker and favicon paths to include baseurl
2 parents cd00501 + c662588 commit f73de31

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

‎_includes/site-favicons.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% if site.favicons %}
22
{% for icon in site.favicons %}
3-
<link rel="icon" type="image/png" href="{{ icon[1] }}" sizes="{{ icon[0] }}x{{ icon[0] }}">
4-
<link rel="apple-touch-icon" sizes="{{ icon[0] }}x{{ icon[0] }}" href="{{ icon[1] }}">
3+
<link rel="icon" type="image/png" href="{{ icon[1] | relative_url }}" sizes="{{ icon[0] }}x{{ icon[0] }}">
4+
<link rel="apple-touch-icon" sizes="{{ icon[0] }}x{{ icon[0] }}" href="{{ icon[1] | relative_url }}">
55
{% endfor %}
66
{% endif %}
7-
<link rel="shortcut icon" href="{{ site.avatarurl + '?s=32' | default: site.logo }}">
7+
<link rel="shortcut icon" href="{{ site.avatarurl + '?s=32' | default: site.logo | relative_url }}">

‎assets/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ sitemap: false
1313
"icons": [
1414
{% for icon in site.favicons %}
1515
{
16-
"src": "{{ icon[1] }}",
16+
"src": "{{ icon[1] | relative_url }}",
1717
"sizes": "{{ icon[0] }}x{{ icon[0] }}"
1818
}{% if forloop.last != true %},{% endif %}
1919
{% endfor %}

‎assets/scripts/sw.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ const cacheName = `static::${version}`;
1010
const buildContentBlob = () => {
1111
return [
1212
{%- for post in site.posts limit: 10 -%}
13-
"{{ site.baseurl }}{{ post.url }}",
13+
"{{ post.url | relative_url }}",
1414
{%- endfor -%}
1515
{%- for page in site.pages -%}
1616
{%- unless page.url contains 'sw.js' or page.url contains '404.html' -%}
17-
"{{ page.url }}",
17+
"{{ page.url | relative_url }}",
1818
{%- endunless -%}
1919
{%- endfor -%}
20-
"{{ site.logo }}", "/assets/default-offline-image.png", "/assets/scripts/fetch.js"
20+
"{{ site.logo | relative_url }}", "{{ site.baseurl }}/assets/default-offline-image.png", "{{ site.baseurl }}/assets/scripts/fetch.js"
2121
]
2222
}
2323

@@ -75,7 +75,7 @@ self.addEventListener("fetch", event => {
7575

7676
if (request.url.match(/\.(jpe?g|png|gif|svg)$/)) {
7777
// If url requested is an image and isn't cached, return default offline image
78-
offlineAsset = "/assets/default-offline-image.png";
78+
offlineAsset = "{{ site.baseurl }}/assets/default-offline-image.png";
7979
}
8080

8181
// For all urls request image from network, then fallback to cache, then fallback to offline page

0 commit comments

Comments
 (0)
0