reverted changes to DocumentContent

removed bootstrap script imported boostrap js module to app.ts
laws-africa · Jul 26, 2023 · 182755c · 182755c
1 parent 5dbf0d6
commit 182755c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/peachjam/js/app.ts b/peachjam/js/app.ts
@@ -1,4 +1,12 @@
 import peachJam from './peachjam';
+import * as bootstrap from '../static/bootstrap/dist/js/bootstrap.bundle.js';
+
+declare global {
+  interface Window {
+    bootstrap?: any;
+  }
+}
+window.bootstrap = bootstrap;
 
 (() => {
   peachJam.setup();

diff --git a/peachjam/js/components/DocumentContent/index.ts b/peachjam/js/components/DocumentContent/index.ts
@@ -11,7 +11,7 @@ class OffCanvas {
   protected offCanvas: any;
   body: HTMLElement | null;
   constructor (element: HTMLElement) {
-    this.offCanvas = new (window as { [key: string]: any }).bootstrap.Offcanvas(element);
+    this.offCanvas = new window.bootstrap.Offcanvas(element);
     this.body = element.querySelector('[data-offcanvas-body]');
   }
 
@@ -36,7 +36,7 @@ class DocumentContent {
 
   constructor (root: HTMLElement) {
     this.root = root;
-    this.documentElement = this.root.querySelector('[data-document-element]');
+    this.documentElement = this.root.querySelector('.content');
 
     this.setupTabs();
     this.setupNav();
@@ -58,13 +58,13 @@ class DocumentContent {
     // If toc setup and mounted successfully, activate toc tab otherwise activate search tab
     if (tocSetupOnTab && tocTabTriggerEl) {
       tocTabTriggerEl.classList.remove('d-none');
-      const tocTab = new (window as { [key: string]: any }).bootstrap.Tab(tocTabTriggerEl);
+      const tocTab = new window.bootstrap.Tab(tocTabTriggerEl);
       tocTab.show();
     } else if (this.root.getAttribute('data-display-type') === 'pdf' && pdfPreviewsTabTriggerEl) {
-      const pdfPreviewsTab = new (window as { [key: string]: any }).bootstrap.Tab(pdfPreviewsTabTriggerEl);
+      const pdfPreviewsTab = new window.bootstrap.Tab(pdfPreviewsTabTriggerEl);
       pdfPreviewsTab.show();
     } else if (searchTabTriggerEl) {
-      const searchTab = new (window as { [key: string]: any }).bootstrap.Tab(searchTabTriggerEl);
+      const searchTab = new window.bootstrap.Tab(searchTabTriggerEl);
       searchTab.show();
     }
   }

diff --git a/peachjam/templates/peachjam/layouts/main.html b/peachjam/templates/peachjam/layouts/main.html
@@ -7,7 +7,6 @@
         type="text/css"/>
 {% endblock %}
 {% block head-js %}
-  <script defer src="{% static 'bootstrap/dist/js/bootstrap.bundle.js' %}"></script>
   <!-- Small script to add the current user agent to the root HTML element -->
   <script type="text/javascript">
     document.addEventListener("DOMContentLoaded", function () {