Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-09 14:55:50 +01:00
Code Issues Packages Projects Releases Activity

converted info dialog to new pattern

Browse Source
This commit is contained in:
zadam
2022-06-16 19:53:33 +02:00
parent 9707094686
commit ec087ed328
8 changed files with 80 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/app/widgets/dialog.js Normal file
View File

@@ -0,0 +1,10 @@
import appContext from "../services/app_context.js";
async function info(message) {
return new Promise(res =>
appContext.triggerCommand("showInfoDialog", {message, callback: res}));
}
export default {
info
};

63
src/public/app/widgets/dialogs/info.js Normal file
View File

@@ -0,0 +1,63 @@
import utils from "../../services/utils.js";
import BasicWidget from "../basic_widget.js";
const TPL = `
<div class="info-dialog modal mx-auto" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title mr-auto">Info message</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="info-dialog-content"></div>
</div>
<div class="modal-footer">
<button class="info-dialog-ok-button btn btn-primary btn-sm">OK</button>
</div>
</div>
</div>
</div>`;
export default class InfoDialog extends BasicWidget {
constructor() {
super();
this.resolve = null;
this.$originallyFocused = null; // element focused before the dialog was opened so we can return to it afterwards
}
doRender() {
this.$widget = $(TPL);
this.$infoContent = this.$widget.find(".info-dialog-content");
this.$okButton = this.$widget.find(".info-dialog-ok-button");
this.$widget.on('shown.bs.modal', () => this.$okButton.trigger("focus"));
this.$widget.on("hidden.bs.modal", () => {
if (this.resolve) {
this.resolve();
}
if (this.$originallyFocused) {
this.$originallyFocused.trigger('focus');
this.$originallyFocused = null;
}
});
this.$okButton.on('click', () => this.$widget.modal("hide"));
}
showInfoDialogEvent({message, callback}) {
this.$originallyFocused = $(':focus');
this.$infoContent.text(message);
utils.openDialog(this.$widget);
this.resolve = callback;
}
}

5
src/public/app/widgets/note_tree.js
View File

@@ -16,6 +16,7 @@ import protectedSessionService from "../services/protected_session.js";
import syncService from "../services/sync.js";
import options from "../services/options.js";
import protectedSessionHolder from "../services/protected_session_holder.js";
import dialogService from "./dialog.js";
const TPL = `
<div class="tree-wrapper">
@@ -401,9 +402,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
(['after', 'before'].includes(data.hitMode)
&& (node.data.noteId === hoistedNoteService.getHoistedNoteId() || node.getParent().data.noteType === 'search'))) {
const infoDialog = await import('../dialogs/info.js');
await infoDialog.info("Dropping notes into this location is not allowed.");
await dialogService.info("Dropping notes into this location is not allowed.");
return;
}

4
src/public/app/widgets/type_widgets/relation_map.js
View File

@@ -8,6 +8,7 @@ import TypeWidget from "./type_widget.js";
import appContext from "../../services/app_context.js";
import utils from "../../services/utils.js";
import froca from "../../services/froca.js";
import dialogService from "../../widgets/dialog.js";
const uniDirectionalOverlays = [
[ "Arrow", {
@@ -509,8 +510,7 @@ export default class RelationMapTypeWidget extends TypeWidget {
&& rel.name === name);
if (relationExists) {
const infoDialog = await import('../../dialogs/info.js');
await infoDialog.info("Connection '" + name + "' between these notes already exists.");
await dialogService.info(`Connection '${name}' between these notes already exists.`);
this.jsPlumbInstance.deleteConnection(connection);