muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix in save macros

Browse Source
This commit is contained in:
sanjayk03-dev
2024-04-10 09:08:00 +05:30
parent 75d2342e41
commit 07692153d5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/macros.js
View File

@@ -224,7 +224,6 @@ module.exports = {
}, },
save_macro: async function () { save_macro: async function () {
if (this.tab == 0 || !this.state.macros[this.tab - 1]) { if (this.tab == 0 || !this.state.macros[this.tab - 1]) {
this.load_macro();
this.confirmSave = false; this.confirmSave = false;
return; return;
} }
@@ -323,10 +322,11 @@ module.exports = {
this.deleteGCode = false; this.deleteGCode = false;
}, },
load_macro: async function () { load_macro: async function () {
if (this.tab == 0) { if (this.tab == 0 || !this.state.macros[this.tab - 1]) {
document.getElementById("macros-name").value = ""; document.getElementById("macros-name").value = "";
document.getElementById("macros-color").value = "#ffffff"; document.getElementById("macros-color").value = "#ffffff";
this.isChecked = true; this.isChecked = true;
this.tab = "0";
this.fileName = "default"; this.fileName = "default";
this.newGcode = ""; this.newGcode = "";
} else { } else {

8
src/pug/templates/macros.pug
View File

@@ -40,16 +40,16 @@ script#macros-template(type="text/x-template")
h1 Macros Configuration h1 Macros Configuration
.flex-row-container .flex-row-container
button.config-button.button-blue(title="Reset Macros", @click="confirmReset=true") Delete All button.config-button.button-blue(title="Reset Macros", @click="confirmReset=true") Reset
message(:show.sync="confirmReset") message(:show.sync="confirmReset")
h3(slot="header") Delete All Macros? h3(slot="header") Reset Macros?
div(slot="body") div(slot="body")
p Are you sure you want to delete all macros? p Are you sure you want to reset all macros?
div(slot="footer") div(slot="footer")
button.pure-button(@click="confirmReset=false") Cancel button.pure-button(@click="confirmReset=false") Cancel
button.pure-button.button-error(@click="delete_all_macros") button.pure-button.button-error(@click="delete_all_macros")
| Delete All | Reset
button.config-button.button-blue(title="Add a Macros", @click="addMacros=true", style="margin-left:5px") New Macro button.config-button.button-blue(title="Add a Macros", @click="addMacros=true", style="margin-left:5px") New Macro