Skip to content

Commit

Permalink
Fixed instant loading when used with use_directory_urls: false
Browse files Browse the repository at this point in the history
  • Loading branch information
squidfunk committed Mar 7, 2021
1 parent d17c488 commit 1d790c9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion material/base.html
Expand Up @@ -217,7 +217,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
</script>
{% endblock %}
{% block scripts %}
<script src="{{ 'assets/javascripts/bundle.8c3a7438.min.js' | url }}"></script>
<script src="{{ 'assets/javascripts/bundle.d1d4d62b.min.js' | url }}"></script>
{% for path in config["extra_javascript"] %}
<script src="{{ path | url }}"></script>
{% endfor %}
Expand Down
8 changes: 5 additions & 3 deletions src/assets/javascripts/integrations/instant/index.ts
Expand Up @@ -104,15 +104,17 @@ function preprocess(urls: string[]): string[] {
if (urls.length < 2)
return urls

/* Compute references URLs */
const [root, next] = urls.sort((a, b) => a.length - b.length)
/* Take the first two URLs and remove everything after the last slash */
const [root, next] = urls.slice(0, 2).map(url => (
url.replace(/[^/]+$/, "")
))

/* Compute common prefix */
let index = 0
if (root === next)
index = root.length
else
while (root.charCodeAt(index) === root.charCodeAt(index))
while (root.charCodeAt(index) === next.charCodeAt(index))
index++

/* Replace common prefix (i.e. base) with effective base */
Expand Down

0 comments on commit 1d790c9

Please sign in to comment.