Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-09-03 14:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(ts): get rid of bootstrap related ts-ignores

Browse Source
This commit is contained in:
Panagiotis Papadopoulos 2025-02-12 08:49:09 +01:00
parent cc1a01955a
commit 65ad4c3a2b
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/app/widgets/buttons/abstract_button.ts
View File

@ -1,3 +1,4 @@
import { Tooltip } from "bootstrap";
import NoteContextAwareWidget from "../note_context_aware_widget.js"; import NoteContextAwareWidget from "../note_context_aware_widget.js";
const TPL = `<button class="button-widget bx" const TPL = `<button class="button-widget bx"
@ -17,7 +18,7 @@ export interface AbstractButtonWidgetSettings {
export default class AbstractButtonWidget<SettingsT extends AbstractButtonWidgetSettings> extends NoteContextAwareWidget { export default class AbstractButtonWidget<SettingsT extends AbstractButtonWidgetSettings> extends NoteContextAwareWidget {
protected settings!: SettingsT; protected settings!: SettingsT;
protected tooltip!: bootstrap.Tooltip; protected tooltip!: Tooltip;
isEnabled(): boolean | null | undefined { isEnabled(): boolean | null | undefined {
return true; return true;
@ -25,11 +26,10 @@ export default class AbstractButtonWidget<SettingsT extends AbstractButtonWidget
doRender() { doRender() {
this.$widget = $(TPL); this.$widget = $(TPL);
// Fix once bootstrap is available as non-UMD this.tooltip = new Tooltip(this.$widget[0], {
//@ts-ignore
this.tooltip = new bootstrap.Tooltip(this.$widget, {
html: true, html: true,
title: () => this.getTitle(), // in case getTitle() returns null -> use empty string as fallback
title: () => this.getTitle() || "",
trigger: "hover", trigger: "hover",
placement: this.settings.titlePlacement, placement: this.settings.titlePlacement,
fallbackPlacements: [this.settings.titlePlacement] fallbackPlacements: [this.settings.titlePlacement]

7
src/public/app/widgets/dialogs/export.ts
View File

@ -7,6 +7,7 @@ import openService from "../../services/open.js";
import BasicWidget from "../basic_widget.js"; import BasicWidget from "../basic_widget.js";
import { t } from "../../services/i18n.js"; import { t } from "../../services/i18n.js";
import type { EventData } from "../../components/app_context.js"; import type { EventData } from "../../components/app_context.js";
import { Modal } from "bootstrap";
const TPL = ` const TPL = `
<div class="export-dialog modal fade mx-auto" tabindex="-1" role="dialog"> <div class="export-dialog modal fade mx-auto" tabindex="-1" role="dialog">
@ -127,7 +128,7 @@ export default class ExportDialog extends BasicWidget {
private taskId: string; private taskId: string;
private branchId: string | null; private branchId: string | null;
private modal?: bootstrap.Modal; private modal?: Modal;
private $form!: JQuery<HTMLElement>; private $form!: JQuery<HTMLElement>;
private $noteTitle!: JQuery<HTMLElement>; private $noteTitle!: JQuery<HTMLElement>;
private $subtreeFormats!: JQuery<HTMLElement>; private $subtreeFormats!: JQuery<HTMLElement>;
@ -146,9 +147,7 @@ export default class ExportDialog extends BasicWidget {
doRender() { doRender() {
this.$widget = $(TPL); this.$widget = $(TPL);
// Remove once bootstrap is fixed. this.modal = Modal.getOrCreateInstance(this.$widget[0]);
// @ts-ignore
this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget);
this.$form = this.$widget.find(".export-form"); this.$form = this.$widget.find(".export-form");
this.$noteTitle = this.$widget.find(".export-note-title"); this.$noteTitle = this.$widget.find(".export-note-title");
this.$subtreeFormats = this.$widget.find(".export-subtree-formats"); this.$subtreeFormats = this.$widget.find(".export-subtree-formats");

2
src/public/app/widgets/editability_select.ts
View File

@ -60,7 +60,7 @@ const TPL = `
export default class EditabilitySelectWidget extends NoteContextAwareWidget { export default class EditabilitySelectWidget extends NoteContextAwareWidget {
private dropdown!: bootstrap.Dropdown; private dropdown!: Dropdown;
private $editabilityActiveDesc!: JQuery<HTMLElement>; private $editabilityActiveDesc!: JQuery<HTMLElement>;
doRender() { doRender() {