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

fix ordering of note contexts, fixes #2283

Browse Source
This commit is contained in:
zadam
2021-10-27 21:32:03 +02:00
parent a7d3dafcf1
commit bcabe5786f
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.48.2", "version": "0.48.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

8
src/public/app/services/note_context.js
View File

@@ -71,7 +71,13 @@ class NoteContext extends Component {
getMainContext() { getMainContext() {
if (this.mainNtxId) { if (this.mainNtxId) {
return appContext.tabManager.getNoteContextById(this.mainNtxId); try {
return appContext.tabManager.getNoteContextById(this.mainNtxId);
}
catch (e) {
this.mainNtxId = null;
return this;
}
} }
else { else {
return this; return this;

2
src/public/app/services/tab_manager.js
View File

@@ -353,7 +353,7 @@ export default class TabManager extends Component {
const order = {}; const order = {};
let i = 0; let i = 0;
for (const ntxId in ntxIdsInOrder) { for (const ntxId of ntxIdsInOrder) {
order[ntxId] = i++; order[ntxId] = i++;
} }

8
src/public/app/widgets/containers/split_note_container.js
View File

@@ -37,6 +37,12 @@ export default class SplitNoteContainer extends FlexContainer {
} }
async openNewNoteSplitEvent({ntxId, notePath}) { async openNewNoteSplitEvent({ntxId, notePath}) {
if (!ntxId) {
logError("empty ntxId!");
ntxId = appContext.tabManager.getActiveMainContext().ntxId;
}
const noteContext = await appContext.tabManager.openEmptyTab(null, 'root', appContext.tabManager.getActiveMainContext().ntxId); const noteContext = await appContext.tabManager.openEmptyTab(null, 'root', appContext.tabManager.getActiveMainContext().ntxId);
// remove the original position of newly created note context // remove the original position of newly created note context
@@ -46,7 +52,7 @@ export default class SplitNoteContainer extends FlexContainer {
// insert the note context after the originating note context // insert the note context after the originating note context
ntxIds.splice(ntxIds.indexOf(ntxId) + 1, 0, noteContext.ntxId); ntxIds.splice(ntxIds.indexOf(ntxId) + 1, 0, noteContext.ntxId);
this.triggerCommand("noteContextReorder", ntxIds); this.triggerCommand("noteContextReorder", {ntxIdsInOrder: ntxIds});
// move the note context rendered widget after the originating widget // move the note context rendered widget after the originating widget
this.$widget.find(`[data-ntx-id="${noteContext.ntxId}"]`) this.$widget.find(`[data-ntx-id="${noteContext.ntxId}"]`)