merge 2.0

Author: lenadax

CHANGES.rst

@@ -31,7 +31,7 @@ Changes
   [lenadax]
 
 
-1.1.0 (unreleased)
+1.1.0 (2026-02-03)
 ------------------
 
 - Refactor package layout to use ``pyproject.toml`` and implicit namespace packages.

js/rollup.conf.js

@@ -10,7 +10,8 @@ window.readCookie = readCookie;
 
 const globals = {
     jquery: 'jQuery',
-    treibstoff: 'treibstoff'
+    treibstoff: 'treibstoff',
+    bootstrap: 'bootstrap'
 };
 
 export default args => {
@@ -27,7 +28,8 @@ export default args => {
         }],
         external: [
             'jquery',
-            'treibstoff'
+            'treibstoff',
+            'bootstrap'
         ]
     };
     if (args.configDebug !== true) {

js/src/cone.js

@@ -6,7 +6,6 @@ import * as header from './header.js';
 import * as keybinder from './keybinder.js';
 import * as layout from './layout.js';
 import * as livesearch from './livesearch.js';
-import * as logo from './logo.js';
 import * as mainmenu from './mainmenu.js';
 import * as navtree from './navtree.js';
 import * as referencebrowser from './referencebrowser.js';
@@ -28,7 +27,6 @@ Object.assign(api, header);
 Object.assign(api, keybinder);
 Object.assign(api, layout);
 Object.assign(api, livesearch);
-Object.assign(api, logo);
 Object.assign(api, mainmenu);
 Object.assign(api, navtree);
 Object.assign(api, referencebrowser);

js/src/mainmenu.js

@@ -1,5 +1,6 @@
 import $ from 'jquery';
 import ts from 'treibstoff';
+import 'bootstrap';
 import { LayoutAware } from './layout.js';
 
 /**
@@ -125,8 +126,9 @@ export class MainMenu extends LayoutAware {
      * Hides all dropdowns in the main menu.
      */
     hide_dropdowns() {
+        const Dropdown = bootstrap.Dropdown;
         this.elems.each((i, el) => {
-            $(el).dropdown('hide');
+            Dropdown.getOrCreateInstance(el).hide();
         });
     }
 

js/src/sidebar.js

@@ -1,4 +1,4 @@
-import $, { event } from 'jquery';
+import $ from 'jquery';
 import ts from 'treibstoff';
 import { global_events } from './globals.js';
 import { ResizeAware } from './layout.js';