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

clearing text area while cancel

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-28 12:40:13 +05:30
parent 0bc72a7af4
commit a6d25e1eb1
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/macros.js
View File

@@ -108,7 +108,8 @@ module.exports = {
this.$set("selectedValues[this.tab - 1]", file.name); this.$set("selectedValues[this.tab - 1]", file.name);
this.$dispatch("macros-edited"); this.$dispatch("macros-edited");
console.log("file.name", file.name);
console.log("file.name type: ", typeof file.name);
SvelteComponents.showDialog("Upload", { SvelteComponents.showDialog("Upload", {
file, file,
onComplete: () => { onComplete: () => {
@@ -192,8 +193,10 @@ module.exports = {
this.$set("newGcode[this.tab - 1]", ""); this.$set("newGcode[this.tab - 1]", "");
} else { } else {
api.delete(`file/${this.selectedValues[this.tab - 1]}`); api.delete(`file/${this.selectedValues[this.tab - 1]}`);
// this.$set("newGcode[this.tab-1]", "");
// this.$set("this.selectedValues[this.tab - 1]", "default");
this.$set("newGcode[this.tab - 1]", ""); this.$set("newGcode[this.tab - 1]", "");
this.$set("this.selectedValues[this.tab - 1]", "default"); this.$set("selectedValues[this.tab - 1]", "default");
this.config.macrosList = this.config.macrosList.filter( this.config.macrosList = this.config.macrosList.filter(
item => item.file_name !== this.selectedValues[this.tab - 1], item => item.file_name !== this.selectedValues[this.tab - 1],
); );
@@ -223,8 +226,8 @@ module.exports = {
const defaultValue = this.config.macros[this.tab - 1]; const defaultValue = this.config.macros[this.tab - 1];
document.getElementById(`macros-name-${this.tab - 1}`).value = defaultValue.name; document.getElementById(`macros-name-${this.tab - 1}`).value = defaultValue.name;
document.getElementById(`macros-color-${this.tab - 1}`).value = defaultValue.color; document.getElementById(`macros-color-${this.tab - 1}`).value = defaultValue.color;
this.$set("selectedValues[this.tab-1]", "default");
this.$set("newGcode[this.tab - 1]", ""); this.$set("newGcode[this.tab - 1]", "");
this.$set("selectedValues[this.tab - 1]", "default");
}, },
deleteAllMacros: async function () { deleteAllMacros: async function () {
this.config.macros = [ this.config.macros = [

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

@@ -281,7 +281,7 @@ script#macros-template(type="text/x-template")
.gcodeContainer .gcodeContainer
textarea.new-gcode( :value='newGcode[tab-1]' @input="updateNewGcode") textarea.new-gcode( :value='newGcode[tab-1]' @input="updateNewGcode")
button.submit-macros(title="Save Macros",@click="confirmSave=true",:disabled="!edited") Save button.submit-macros.button-success(title="Save Macros",@click="confirmSave=true",:disabled="!edited") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros",style="margin-left:5px") Cancel button.submit-macros(title="Cancel Macros",@click="cancelMacros",style="margin-left:5px") Cancel
button.submit-macros(title="Cancel Macros",@click="printState",style="margin-left:5px") Print State button.submit-macros(title="Cancel Macros",@click="printState",style="margin-left:5px") Print State

1
src/stylus/style.styl
View File

@@ -693,7 +693,6 @@ span.unit
width 140px width 140px
margin-top 30px margin-top 30px
font-weight normal font-weight normal
background-color #add1ad
color #fff color #fff
border 0 border 0