Initialize more content

Author: josevalim

assets/js/entry/html.js

@@ -27,19 +27,23 @@ import SwupProgressPlugin from '@swup/progress-plugin'
 
 onDocumentReady(() => {
   const params = new URLSearchParams(window.location.search)
+  const isEmbedded = window.self !== window.parent
   const isPreview = params.has('preview')
+  const isHint = params.has('hint')
 
-  initTabsets() // alters content HTML, so is run early
   initTheme(params.get('theme'))
+  initStyling()
+
+  initTabsets()
   initContent(isPreview)
   initMakeup()
   initTooltips()
-  initHintsPage()
   initCopyButton()
-  initStyling()
 
-  if (isPreview) {
+  if (isPreview && isEmbedded) {
     initPreview()
+  } if (isHint && isEmbedded) {
+    initHintsPage()
   } else {
     if (window.location.protocol !== 'file:') {
       new Swup({
@@ -52,9 +56,17 @@ onDocumentReady(() => {
         },
         hooks: {
           'page:view': () => {
+            initTabsets()
+            initContent(false)
+            initMakeup()
+            initTooltips()
+            initCopyButton()
+
             updateSidebarDrawer()
             updateSidebarContent()
+            initSearch()
             initSearchPage()
+            initSettings()
           }
         },
         linkSelector: 'a[href]:not([href^="/"]):not([href^="http"])',
@@ -63,13 +75,14 @@ onDocumentReady(() => {
     }
 
     initVersions()
-    initSidebarDrawer()
-    initSidebarContent()
-    initSearch()
     initModal()
     initKeyboardShortcuts()
     initQuickSwitch()
     initToast()
+
+    initSidebarDrawer()
+    initSidebarContent()
+    initSearch()
     initSearchPage()
     initSettings()
   }

assets/js/tooltips/hint-page.js

@@ -9,19 +9,12 @@ const CONTENT_INNER_SELECTOR = '.content-inner'
  * and sends to the parent window as an event.
  */
 export function initialize () {
-  if (shouldSendHint()) {
-    const hint = buildHint()
-    if (hint) {
-      sendHintToParentWindow(hint)
-    }
+  const hint = buildHint()
+  if (hint) {
+    sendHintToParentWindow(hint)
   }
 }
 
-function shouldSendHint () {
-  const params = new URLSearchParams(window.location.search)
-  return params.has('hint') && window.self !== window.parent
-}
-
 function sendHintToParentWindow (hint) {
   const href = window.location.href
   const message = { hint, href }

formatters/html/dist/html-FU3IVMGH.js renamed to formatters/html/dist/html-HJ5ACJPS.js

@@ -64,9 +64,9 @@
   <% end %>
 </nav>
 
-<main class="content page-<%= type %>" id="main" data-type="<%= sidebar_type(type) %>">
-  <output role="status" id="toast"></output>
+<output role="status" id="toast"></output>
 
+<main class="content page-<%= type %>" id="main" data-type="<%= sidebar_type(type) %>">
   <div id="content" class="content-inner">
     <div class="top-search">
       <div class="search-settings">