Fixes

Author: josevalim

assets/js/entry/html.js

@@ -40,13 +40,25 @@ onDocumentReady(() => {
   if (isPreview) {
     initPreview()
   } else {
-    new Swup({
-      animationSelector: false,
-      containers: ['#main'],
-      hooks: {'page:view': initSidebarContent},
-      linkSelector: 'a[href]:not([href^="/"]):not([href^="http"]):not(.no-swup)',
-      plugins: [new SwupA11yPlugin()]
-    })
+    if (window.location.protocol !== 'file:') {
+      new Swup({
+        animationSelector: false,
+        containers: ['#main'],
+        ignoreVisit: (url) => {
+          const path = url.split('#')[0]
+          return path === window.location.pathname ||
+            path === window.location.pathname + '.html'
+        },
+        hooks: {
+          'page:view': () => {
+            initSidebarContent()
+            initSearchPage()
+          }
+        },
+        linkSelector: 'a[href]:not([href^="/"]):not([href^="http"])',
+        plugins: [new SwupA11yPlugin()]
+      })
+    }
 
     initVersions()
     initSidebarDrawer()

assets/js/search-page.js

@@ -5,9 +5,13 @@ import { qs, escapeHtmlEntities, isBlank, getQueryParamByName, getProjectNameAnd
 import { setSearchInputValue } from './search-bar'
 
 const EXCERPT_RADIUS = 80
-
 const SEARCH_CONTAINER_SELECTOR = '#search'
 
+lunr.tokenizer.separator = /\s+/
+lunr.QueryLexer.termSeparator = /\s+/
+lunr.Pipeline.registerFunction(docTokenFunction, 'docTokenSplitter')
+lunr.Pipeline.registerFunction(docTrimmerFunction, 'docTrimmer')
+
 /**
  * Performs a full-text search within the documentation
  * for the query in URL params and renders the result.
@@ -49,12 +53,6 @@ function renderResults ({ value, results, errorMessage }) {
 }
 
 async function getIndex () {
-  // lunr by default splits on - but we don't want that.
-  lunr.tokenizer.separator = /\s+/
-  lunr.QueryLexer.termSeparator = /\s+/
-  lunr.Pipeline.registerFunction(docTokenFunction, 'docTokenSplitter')
-  lunr.Pipeline.registerFunction(docTrimmerFunction, 'docTrimmer')
-
   const cachedIndex = await loadIndex()
   if (cachedIndex) { return cachedIndex }
 

assets/js/sidebar/sidebar-list.js

@@ -65,7 +65,6 @@ function renderSidebarNodeList (nodesByType, type) {
   })
 
   nodeList.querySelectorAll('li a').forEach(anchor => {
-    anchor.classList.add('no-swup')
     anchor.addEventListener('click', event => {
       const target = event.target
       const listItem = target.closest('li')