gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
zadam 2022-12-22 23:38:57 +01:00
parent 29713de6cd
commit 7147cc267e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/public/app/components/tab_manager.js
View File

@ -80,8 +80,10 @@ export default class TabManager extends Component {
} }
if (filteredTabs.length === 0) { if (filteredTabs.length === 0) {
const [notePath] = treeService.getHashValueFromAddress();
filteredTabs.push({ filteredTabs.push({
notePath: glob.extraHoistedNoteId || 'root', notePath: notePath || 'root',
active: true, active: true,
hoistedNoteId: glob.extraHoistedNoteId || 'root' hoistedNoteId: glob.extraHoistedNoteId || 'root'
}); });
@ -98,7 +100,7 @@ export default class TabManager extends Component {
}); });
// if there's notePath in the URL, make sure it's open and active // if there's notePath in the URL, make sure it's open and active
// (useful, among others, for opening clipped notes from clipper) // (useful, for e.g. opening clipped notes from clipper or opening link in an extra window)
if (treeService.isNotePathInAddress()) { if (treeService.isNotePathInAddress()) {
const [notePath, ntxId] = treeService.getHashValueFromAddress(); const [notePath, ntxId] = treeService.getHashValueFromAddress();
@ -106,7 +108,7 @@ export default class TabManager extends Component {
} }
} }
catch (e) { catch (e) {
logError(`Loading tabs '${options.get('openTabs')}' failed: ${e.message}`); logError(`Loading tabs '${options.get('openTabs')}' failed: ${e.message} ${e.stack}`);
// try to recover // try to recover
await this.openEmptyTab(); await this.openEmptyTab();

6
src/public/app/services/hoisted_note.js
View File

@ -51,7 +51,11 @@ async function checkNoteAccess(notePath, noteContext) {
const hoistedNoteId = noteContext.hoistedNoteId; const hoistedNoteId = noteContext.hoistedNoteId;
if (!resolvedNotePath.includes(hoistedNoteId) && !resolvedNotePath.includes('_hidden')) { if (!resolvedNotePath.includes(hoistedNoteId) && !resolvedNotePath.includes('_hidden')) {
if (!await dialogService.confirm("Requested note is outside of hoisted note subtree and you must unhoist to access the note. Do you want to proceed with unhoisting?")) { const requestedNote = await froca.getNote(treeService.getNoteIdFromNotePath(resolvedNotePath));
const hoistedNote = await froca.getNote(hoistedNoteId);
if (hoistedNote.hasAncestor('_hidden')
|| !await dialogService.confirm(`Requested note '${requestedNote.title}' is outside of hoisted note '${hoistedNote.title}' subtree and you must unhoist to access the note. Do you want to proceed with unhoisting?`)) {
return false; return false;
} }