mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	tree settings popup fixes
This commit is contained in:
		| @@ -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; | ||||
|     } | ||||
|     </style> | ||||
| @@ -81,6 +81,8 @@ const TPL = ` | ||||
|                 <input class="form-check-input hide-included-images" type="checkbox" value=""> | ||||
|                  | ||||
|                 Hide images included in a note | ||||
|                 <span class="bx bx-info-circle"  | ||||
|                       title="Images which are shown in the parent text note will not be displayed in the tree"></span> | ||||
|             </label> | ||||
|         </div> | ||||
|      | ||||
| @@ -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")); | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user