diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js index e8c0cd7b4..de97e8450 100644 --- a/src/public/app/widgets/note_tree.js +++ b/src/public/app/widgets/note_tree.js @@ -61,7 +61,7 @@ const TPL = ` border: 1px solid var(--main-border-color); padding: 20px; z-index: 1000; - width: 300px; + width: 320px; border-radius: 10px 0 10px 10px; } @@ -81,6 +81,8 @@ const TPL = ` Hide images included in a note + @@ -161,8 +163,14 @@ export default class NoteTreeWidget extends TabAwareWidget { top: top, left: left }).addClass("show"); + + return false; }); + this.$treeSettingsPopup.on("click", e => { e.stopPropagation(); }); + + $(document).on('click', () => this.$treeSettingsPopup.hide()); + this.$saveTreeSettingsButton = this.$treeSettingsPopup.find('.save-tree-settings-button'); this.$saveTreeSettingsButton.on('click', async () => { await this.setHideArchivedNotes(this.$hideArchivedNotesCheckbox.prop("checked")); diff --git a/src/routes/api/login.js b/src/routes/api/login.js index 1c06305e0..6bca0212a 100644 --- a/src/routes/api/login.js +++ b/src/routes/api/login.js @@ -42,7 +42,7 @@ async function loginSync(req) { const givenHash = req.body.hash; if (expectedHash !== givenHash) { - return [400, { message: "Sync login credentials are incorrect." }]; + return [400, { message: "Sync login credentials are incorrect. It looks like you're trying to sync two different initialized documents which is not possible." }]; } req.session.loggedIn = true;