mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 02:16:05 +01:00 
			
		
		
		
	WIP per-tab hoisting
This commit is contained in:
		| @@ -7,10 +7,8 @@ const eventService = require('./events'); | ||||
| const repository = require('./repository'); | ||||
| const cls = require('../services/cls'); | ||||
| const Note = require('../entities/note'); | ||||
| const NoteRevision = require('../entities/note_revision'); | ||||
| const Branch = require('../entities/branch'); | ||||
| const Attribute = require('../entities/attribute'); | ||||
| const hoistedNoteService = require('../services/hoisted_note'); | ||||
| const protectedSessionService = require('../services/protected_session'); | ||||
| const log = require('../services/log'); | ||||
| const utils = require('../services/utils'); | ||||
| @@ -524,7 +522,7 @@ function deleteBranch(branch, deleteId, taskContext) { | ||||
|  | ||||
|     if (branch.branchId === 'root' | ||||
|         || branch.noteId === 'root' | ||||
|         || branch.noteId === hoistedNoteService.getHoistedNoteId()) { | ||||
|         || branch.noteId === cls.getHoistedNoteId()) { | ||||
|  | ||||
|         throw new Error("Can't delete root branch/note"); | ||||
|     } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user