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

unified naming of IDs in all lower case

Browse Source
This commit is contained in:
azivner
2017-10-10 20:19:16 -04:00
parent fb28111288
commit af8b26cbd5
13 changed files with 136 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
static/js/encryption.js
View File

@@ -4,11 +4,7 @@ function handleEncryption(requireEncryption, modal, callback) {
if (requireEncryption && globalDataKey === null) {
globalEncryptionCallback = callback;
if (!modal) {
$("#noteDetailWrapper").hide();
}
$("#encryptionPasswordDialog").dialog({
$("#encryption-password-dialog").dialog({
modal: modal,
width: 400,
open: () => {
@@ -72,13 +68,12 @@ function computeScrypt(password, salt, callback) {
});
}
$("#encryptionPasswordForm").submit(() => {
const password = $("#encryptionPassword").val();
$("#encryptionPassword").val("");
$("#encryption-password-form").submit(() => {
const password = $("#encryption-password").val();
$("#encryption-password").val("");
getDataKey(password).then(key => {
$("#noteDetailWrapper").show();
$("#encryptionPasswordDialog").dialog("close");
$("#encryption-password-dialog").dialog("close");
globalDataKey = key;