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

fix

Browse Source
This commit is contained in:
sanjayk03-dev
2024-04-06 13:20:57 +05:30
parent facfc5600b
commit a698aed0e8
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/js/macros.js
View File

@@ -27,7 +27,7 @@ module.exports = {
}; };
}, },
events: { events: {
"macros-edited": function () { "macro-edited": function () {
this.edited = true; this.edited = true;
}, },
}, },
@@ -70,22 +70,22 @@ module.exports = {
update_new_gcode: function (event) { update_new_gcode: function (event) {
if (this.tab != 0) { if (this.tab != 0) {
this.newGcode = event.target.value; this.newGcode = event.target.value;
this.$dispatch("macros-edited"); this.$dispatch("macro-edited");
} }
}, },
editedColor: function (event) { editedColor: function (event) {
if (this.tab != 0 && this.config.macros[this.tab - 1].color != event.target.value) { if (this.tab != 0 && this.config.macros[this.tab - 1].color != event.target.value) {
this.$dispatch("macros-edited"); this.$dispatch("macro-edited");
} }
}, },
editedAlert: function () { editedAlert: function () {
if (this.tab != 0) { if (this.tab != 0) {
this.$dispatch("macros-edited"); this.$dispatch("macro-edited");
} }
}, },
editedName: function (event) { editedName: function (event) {
if (this.tab != 0 && this.config.macros[this.tab - 1].name != event.target.value) { if (this.tab != 0 && this.config.macros[this.tab - 1].name != event.target.value) {
this.$dispatch("macros-edited"); this.$dispatch("macro-edited");
} }
}, },
showDialogAsync: function (title, file) { showDialogAsync: function (title, file) {
@@ -122,7 +122,7 @@ module.exports = {
this.newGcode = ""; this.newGcode = "";
} }
if (file != this.config.macros[this.tab - 1].file_name) { if (file != this.config.macros[this.tab - 1].file_name) {
this.$dispatch("macros-edited"); this.$dispatch("macro-edited");
} }
}, },
removeFromList: async function () { removeFromList: async function () {
@@ -169,7 +169,7 @@ module.exports = {
alert("Restore failed"); alert("Restore failed");
} }
} }
this.$dispatch("macros-edited"); this.$dispatch("macro-edited");
try { try {
await this.showDialogAsync("Upload", file); await this.showDialogAsync("Upload", file);
this.load(); this.load();
@@ -255,7 +255,9 @@ module.exports = {
this.edited = false; this.edited = false;
}, },
check_gcode_with_macro: function () { check_gcode_with_macro: function () {
const macro_with_filename = this.config.macros.find(item => item.file_name == this.fileName); const macro_with_filename = this.config.macros.find(
item => this.fileName != "default" && item.file_name == this.fileName,
);
if (macro_with_filename) { if (macro_with_filename) {
this.deleteGCode = false; this.deleteGCode = false;
this.macroFound = true; this.macroFound = true;
@@ -265,7 +267,9 @@ module.exports = {
}, },
delete_current: async function () { delete_current: async function () {
const filename = this.fileName; const filename = this.fileName;
const macro_with_filename = this.config.macros.filter(item => item.file_name == this.fileName); const macro_with_filename = this.config.macros.filter(
item => item.file_name != "default" && item.file_name == this.fileName,
);
if (macro_with_filename.length != 0) { if (macro_with_filename.length != 0) {
this.macroFound = false; this.macroFound = false;
macro_with_filename.forEach(item => (item.file_name = "default")); macro_with_filename.forEach(item => (item.file_name = "default"));