Fixed #1696: infinite loop when using instant loading

squidfunk · May 16, 2020 · 900c113 · 900c113
1 parent b775328
commit 900c113
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/...assets/javascripts/bundle.8566d47a.min.js → ...assets/javascripts/bundle.4e2bfc5d.min.js b/...assets/javascripts/bundle.8566d47a.min.js → ...assets/javascripts/bundle.4e2bfc5d.min.js
diff --git a/material/assets/javascripts/bundle.4e2bfc5d.min.js.map b/material/assets/javascripts/bundle.4e2bfc5d.min.js.map
diff --git a/material/assets/javascripts/bundle.8566d47a.min.js.map b/material/assets/javascripts/bundle.8566d47a.min.js.map
diff --git a/material/assets/manifest.json b/material/assets/manifest.json
@@ -1,6 +1,6 @@
 {
-  "assets/javascripts/bundle.js": "assets/javascripts/bundle.8566d47a.min.js",
-  "assets/javascripts/bundle.js.map": "assets/javascripts/bundle.8566d47a.min.js.map",
+  "assets/javascripts/bundle.js": "assets/javascripts/bundle.4e2bfc5d.min.js",
+  "assets/javascripts/bundle.js.map": "assets/javascripts/bundle.4e2bfc5d.min.js.map",
   "assets/javascripts/vendor.js": "assets/javascripts/vendor.809e24aa.min.js",
   "assets/javascripts/vendor.js.map": "assets/javascripts/vendor.809e24aa.min.js.map",
   "assets/javascripts/worker/search.js": "assets/javascripts/worker/search.f6ebf1dc.min.js",

diff --git a/material/base.html b/material/base.html
@@ -179,7 +179,7 @@ <h1>{{ page.title | default(config.site_name, true)}}</h1>
     </div>
     {% block scripts %}
       <script src="{{ 'assets/javascripts/vendor.809e24aa.min.js' | url }}"></script>
-      <script src="{{ 'assets/javascripts/bundle.8566d47a.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.4e2bfc5d.min.js' | url }}"></script>
       {%- set translations = {} -%}
       {%- for key in [
         "clipboard.copy",

diff --git a/src/assets/javascripts/index.ts b/src/assets/javascripts/index.ts
@@ -383,8 +383,11 @@ export function initialize(config: unknown) {
 
             /* Determine common prefix */
             let index = 0
-            while (a.charAt(index) === b.charAt(index))
-              index++
+            if (a === b)
+              index = a.length
+            else
+              while (a.charAt(index) === b.charAt(index))
+                index++
 
             /* Replace common prefix (i.e. base) with effective base */
             for (let i = 0; i < urls.length; i++)