Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 18:05:55 +01:00
Code Issues Packages Projects Releases Activity

delete confirmation lists notes for deletion in a UL list, #438

Browse Source
This commit is contained in:
zadam
2019-08-17 09:00:53 +02:00
parent ad7a6c4d79
commit 1882b089ab
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/javascripts/dialogs/confirm.js
View File

@@ -16,7 +16,11 @@ function confirm(message) {
glob.activeDialog = $dialog; glob.activeDialog = $dialog;
$confirmContent.text(message); if (typeof message === 'string') {
message = $("<div>").text(message);
}
$confirmContent.empty().append(message);
$dialog.modal(); $dialog.modal();

4
src/public/javascripts/services/branches.js
View File

@@ -87,8 +87,8 @@ async function deleteNodes(nodes) {
return false; return false;
} }
const nodeTitles = nodes.map((node) => node.title); const nodeTitles = $("<ul>").append(...nodes.map(node => $("<li>").text(node.title)));
const confirmText = 'This will delete the following notes and their sub-notes: ' + nodeTitles.join(', '); const confirmText = $("<div>").text('This will delete the following notes and their sub-notes: ').append(nodeTitles);
if (!await confirmDialog.confirm(confirmText)) { if (!await confirmDialog.confirm(confirmText)) {
return false; return false;

2
src/views/dialogs/confirm.ejs
View File

@@ -1,5 +1,5 @@
<div id="confirm-dialog" class="modal mx-auto" tabindex="-1" role="dialog"> <div id="confirm-dialog" class="modal mx-auto" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document"> <div class="modal-dialog modal-dialog-scrollable" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title mr-auto">Confirmation</h5> <h5 class="modal-title mr-auto">Confirmation</h5>