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

non-modal protected session password form is now done separately as a kind of detail component. Also reworked branch prefix dialog input

Browse Source
This commit is contained in:
azivner
2018-12-27 20:04:59 +01:00
parent 1dad919de9
commit d4db265fd9
7 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/public/javascripts/services/protected_session.js
View File

@@ -6,8 +6,10 @@ import protectedSessionHolder from './protected_session_holder.js';
import infoService from "./info.js";
const $dialog = $("#protected-session-password-dialog");
const $passwordForm = $("#protected-session-password-form");
const $password = $("#protected-session-password");
const $component = $("#protected-session-password-component");
const $passwordForms = $(".protected-session-password-form");
const $passwordInputs = $(".protected-session-password");
const $passwordInModal = $("#protected-session-password-in-modal");
const $noteDetailWrapper = $("#note-detail-wrapper");
const $protectButton = $("#protect-button");
const $unprotectButton = $("#unprotect-button");
@@ -36,12 +38,16 @@ function ensureProtectedSession(requireProtectedSession, modal) {
// using deferred instead of promise because it allows resolving from outside
protectedSessionDeferred = dfd;
if (treeService.getCurrentNode().data.isProtected) {
$noteDetailWrapper.hide();
}
if (modal) {
if (treeService.getCurrentNode().data.isProtected) {
$noteDetailWrapper.hide();
}
$dialog.toggleClass("modalless", !modal);
$dialog.modal();
$dialog.modal();
}
else {
$component.show();
}
}
else {
dfd.resolve(false);
@@ -50,9 +56,8 @@ function ensureProtectedSession(requireProtectedSession, modal) {
return dfd.promise();
}
async function setupProtectedSession() {
const password = $password.val();
$password.val("");
async function setupProtectedSession(password) {
$passwordInputs.val("");
const response = await enterProtectedSessionOnServer(password);
@@ -72,7 +77,7 @@ async function setupProtectedSession() {
await noteDetailService.reload();
if (protectedSessionDeferred !== null) {
ensureDialogIsClosed($dialog, $password);
ensureDialogIsClosed();
$noteDetailWrapper.show();
@@ -93,7 +98,7 @@ function ensureDialogIsClosed() {
}
catch (e) {}
$password.val('');
$passwordInputs.val('');
}
async function enterProtectedSessionOnServer(password) {
@@ -116,7 +121,7 @@ async function protectNoteAndSendToServer() {
treeService.setProtected(note.noteId, note.isProtected);
noteDetailService.setNoteBackgroundIfProtected(note);console.log(note);
noteDetailService.setNoteBackgroundIfProtected(note);
}
async function unprotectNoteAndSendToServer() {
@@ -157,27 +162,18 @@ async function protectSubtree(noteId, protect) {
noteDetailService.reload();
}
$passwordForm.submit(() => {
setupProtectedSession();
$passwordForms.submit(function() { // needs to stay as function
const password = $(this).find(".protected-session-password").val();
setupProtectedSession(password);
return false;
});
// this doesn't work, event is not triggered :/
$dialog.on("show.bs.modal", e => function() {
if ($(this).hasClass("modalless")) {
// return "stolen" focus to tree
treeService.getCurrentNode().setFocus();
}
else {
$password.focus();
}
});
$protectButton.click(protectNoteAndSendToServer);
$unprotectButton.click(unprotectNoteAndSendToServer);
$dialog.on("shown.bs.modal", e => $password.focus());
$dialog.on("shown.bs.modal", e => $passwordInModal.focus());
export default {
ensureProtectedSession,