From ecda9ca48a3f8ce5c8137d7a665d6cfc4f72cd5d Mon Sep 17 00:00:00 2001 From: Minty Trebor Date: Sun, 16 Jun 2024 14:18:55 +0100 Subject: [PATCH] 01.03.04 Fixed bug identifed in https://github.com/MintyTrebor/BtnCmd/issues/18 --- src/BtnCmdMainPanel.vue | 20 +++++++++++++++----- src/plugin.json | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/BtnCmdMainPanel.vue b/src/BtnCmdMainPanel.vue index f16760a..af98932 100644 --- a/src/BtnCmdMainPanel.vue +++ b/src/BtnCmdMainPanel.vue @@ -54,10 +54,10 @@
- + --> @@ -971,9 +971,10 @@ export default { bSBCCInstalled: false, showSBCCEdit: false, tmpSBCCDef: {}, - btnCmdVersion: '01.03.03', + lastLayoutTabID: null, + btnCmdVersion: '01.03.04', btnCmd : { - btnCmdVersion: '01.03.03', + btnCmdVersion: '01.03.04', btnCmdIDUpdateRun: true, systemSettings: { lastID: 1, @@ -1650,6 +1651,7 @@ export default { async editModeToggle(){ this.setActionResponse(''); var tmpCurrTabID = this.currTab + //this.tmpDebgug = this.currTab this.editMode = !this.editMode; if(this.editMode){ await this.$nextTick() @@ -1662,6 +1664,7 @@ export default { createModeToggle(){ this.setActionResponse(''); this.createMode = !this.createMode; + this.lastLayoutTabID = this.currTab; if(this.createMode){ var tmpArr = this.btnCmd.tabs.filter(item => item.embedTab === true); if(tmpArr.length >= 1){ @@ -1676,8 +1679,10 @@ export default { this.saveSettings(); await this.$nextTick(); var tmpCurrTabID = this.currTab; + if(this.createMode){ this.createMode = false + tmpCurrTabID = this.lastLayoutTabID; } if(this.editMode){ this.editMode = false @@ -1692,7 +1697,10 @@ export default { var tmpCurrTabID = this.currTab; this.loadSettings(); await this.$nextTick(); - if(this.createMode){this.createMode = false} + if(this.createMode){ + this.createMode = false + tmpCurrTabID = this.lastLayoutTabID; + } if(this.editMode){this.editMode = false} await this.$nextTick() this.onChangeTab(tmpCurrTabID); @@ -1707,7 +1715,9 @@ export default { } }, onChangeTab(tmpTabID){ + //console.log("Changing Tab to: ", tmpTabID) this.currTab = tmpTabID; + //this.tmpDebgug = this.currTab this.getCurrTabIndex = "tab-"+tmpTabID; var tmpTabObj = this.btnCmd.tabs.filter(item => item.tabID == tmpTabID); this.currTabObj = tmpTabObj[0]; diff --git a/src/plugin.json b/src/plugin.json index f2b6560..ca62b67 100644 --- a/src/plugin.json +++ b/src/plugin.json @@ -3,7 +3,7 @@ "id": "BtnCmd", "name": "BtnCmd", "author": "Minty Trebor", - "version": "01.03.03", + "version": "01.03.04", "license": "GPL-3.0-or-later", "homepage": "https://github.com/MintyTrebor", "dwcVersion": "auto",