From 2f5d3729de281c9b2225b3b4ed09fcf3f6fb9289 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Mon, 24 May 2021 21:43:24 +0200
Subject: [PATCH] fixes

---
 src/public/app/services/tab_manager.js        |  4 ++--
 .../app/widgets/containers/pane_container.js  |  9 ++++++---
 src/public/app/widgets/tab_row.js             | 20 +++++++++----------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/public/app/services/tab_manager.js b/src/public/app/services/tab_manager.js
index 5d391fa1f..0fc318925 100644
--- a/src/public/app/services/tab_manager.js
+++ b/src/public/app/services/tab_manager.js
@@ -331,8 +331,8 @@ export default class TabManager extends Component {
 
         let i = 0;
 
-        for (const ntxId in ntxIdsInOrder) {
-            for (const noteContext of this.noteContexts[ntxId].getSubContexts()) {
+        for (const ntxId of ntxIdsInOrder) {
+            for (const noteContext of this.getNoteContextById(ntxId).getSubContexts()) {
                 order[noteContext.ntxId] = i++;
             }
         }
diff --git a/src/public/app/widgets/containers/pane_container.js b/src/public/app/widgets/containers/pane_container.js
index 4f6b46277..779404451 100644
--- a/src/public/app/widgets/containers/pane_container.js
+++ b/src/public/app/widgets/containers/pane_container.js
@@ -35,17 +35,20 @@ export default class PaneContainer extends FlexContainer {
     }
 
     async openNewPaneCommand({ntxId}) {
-        const noteContext = await appContext.tabManager.openEmptyTab(null, 'root', appContext.tabManager.getActiveContext().ntxId);
+        const noteContext = await appContext.tabManager.openEmptyTab(null, 'root', appContext.tabManager.getActiveMainContext().ntxId);
 
+        // remove the original position of newly created note context
         const ntxIds = appContext.tabManager.children.map(c => c.ntxId)
             .filter(id => id !== noteContext.ntxId);
 
+        // insert the note context after the originating note context
         ntxIds.splice(ntxIds.indexOf(ntxId) + 1, 0, noteContext.ntxId);
 
         this.triggerCommand("noteContextReorder", ntxIds);
 
+        // move the note context rendered widget after the originating widget
         this.$widget.find(`[data-ntx-id="${noteContext.ntxId}"]`)
-            .insertAfter(this.$widget.find(`[data-ntx-id="${ntxId}"]`))
+            .insertAfter(this.$widget.find(`[data-ntx-id="${ntxId}"]`));
 
         await appContext.tabManager.activateNoteContext(noteContext.ntxId);
 
@@ -72,7 +75,7 @@ export default class PaneContainer extends FlexContainer {
 
         for (const ntxId in this.widgets) {
             const noteContext = appContext.tabManager.getNoteContextById(ntxId);
-console.log(noteContext, activeNtxId);
+
             const widget = this.widgets[ntxId];
             widget.toggleExt(show && activeNtxId && [noteContext.ntxId, noteContext.mainNtxId].includes(activeNtxId));
         }
diff --git a/src/public/app/widgets/tab_row.js b/src/public/app/widgets/tab_row.js
index 5ea499301..063e6389e 100644
--- a/src/public/app/widgets/tab_row.js
+++ b/src/public/app/widgets/tab_row.js
@@ -251,7 +251,7 @@ export default class TabRowWidget extends BasicWidget {
         this.$widget.on('contextmenu', '.note-tab', e => {
             e.preventDefault();
 
-            const ntxId = $(e.target).closest(".note-tab").attr('data-tab-id');
+            const ntxId = $(e.target).closest(".note-tab").attr('data-ntx-id');
 
             contextMenu.show({
                 x: e.pageX,
@@ -381,7 +381,7 @@ export default class TabRowWidget extends BasicWidget {
     }
 
     addTab(ntxId) {
-        const $tab = $(TAB_TPL).attr('data-tab-id', ntxId);
+        const $tab = $(TAB_TPL).attr('data-ntx-id', ntxId);
 
         keyboardActionService.updateDisplayedShortcuts($tab);
 
@@ -399,7 +399,7 @@ export default class TabRowWidget extends BasicWidget {
     }
 
     closeActiveTabCommand({$el}) {
-        const ntxId = $el.closest(".note-tab").attr('data-tab-id');
+        const ntxId = $el.closest(".note-tab").attr('data-ntx-id');
 
         appContext.tabManager.removeNoteContext(ntxId);
     }
@@ -407,7 +407,7 @@ export default class TabRowWidget extends BasicWidget {
     setTabCloseEvent($tab) {
         $tab.on('mousedown', e => {
             if (e.which === 2) {
-                appContext.tabManager.removeNoteContext($tab.attr('data-tab-id'));
+                appContext.tabManager.removeNoteContext($tab.attr('data-ntx-id'));
 
                 return true; // event has been handled
             }
@@ -454,8 +454,8 @@ export default class TabRowWidget extends BasicWidget {
         }
     }
 
-    getTabIdsInOrder() {
-        return this.tabEls.map(el => el.getAttribute('data-tab-id'));
+    getNtxIdsInOrder() {
+        return this.tabEls.map(el => el.getAttribute('data-ntx-id'));
     }
 
     updateTitle($tab, title) {
@@ -463,11 +463,11 @@ export default class TabRowWidget extends BasicWidget {
     }
 
     getTabById(ntxId) {
-        return this.$widget.find(`[data-tab-id='${ntxId}']`);
+        return this.$widget.find(`[data-ntx-id='${ntxId}']`);
     }
 
     getTabId($tab) {
-        return $tab.attr('data-tab-id');
+        return $tab.attr('data-ntx-id');
     }
 
     noteContextRemovedEvent({ntxIds}) {
@@ -509,7 +509,7 @@ export default class TabRowWidget extends BasicWidget {
             this.draggabillies.push(draggabilly);
 
             draggabilly.on('pointerDown', _ => {
-                appContext.tabManager.activateNoteContext(tabEl.getAttribute('data-tab-id'));
+                appContext.tabManager.activateNoteContext(tabEl.getAttribute('data-ntx-id'));
             });
 
             draggabilly.on('dragStart', _ => {
@@ -573,7 +573,7 @@ export default class TabRowWidget extends BasicWidget {
 
             tabEl.parentNode.insertBefore(tabEl, beforeEl);
         }
-        this.triggerEvent('tabReorder', {ntxIdsInOrder: this.getTabIdsInOrder()});
+        this.triggerEvent('tabReorder', {ntxIdsInOrder: this.getNtxIdsInOrder()});
         this.layoutTabs();
     }