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

button postioned chagned and alert box fix

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-04 23:10:06 +05:30
parent 2752dcb8f7
commit 4e96582842
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/macros.js
View File

@@ -134,6 +134,7 @@ module.exports = {
gcode_file_time: 0, gcode_file_time: 0,
}, },
]; ];
this.confirmReset=false;
try { try {
await api.put("config/save", this.config); await api.put("config/save", this.config);
console.log("Successfully flushed"); console.log("Successfully flushed");

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

@@ -43,11 +43,6 @@ script#macros-template(type="text/x-template")
input.input-color(type="color",id="macros-color-0",value="#ffffff") input.input-color(type="color",id="macros-color-0",value="#ffffff")
input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-0") input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-0")
p.title G-Code p.title G-Code
select(title="Select previously uploaded GCode programs.",
v-model="state.selected",@change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px")
option(v-for="file in state.files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open", button.pure-button(title="Upload a new GCode program.", @click="open",
:disabled="!is_ready",style="height:40px;width:130px;font-weight:normal;border-radius:5px;margin-left:4px;background-color:#5a9ad7;color:#fff;display:flex;align-items:center;justify-content:space-around") Upload :disabled="!is_ready",style="height:40px;width:130px;font-weight:normal;border-radius:5px;margin-left:4px;background-color:#5a9ad7;color:#fff;display:flex;align-items:center;justify-content:space-around") Upload
.fa.fa-upload .fa.fa-upload
@@ -55,6 +50,11 @@ script#macros-template(type="text/x-template")
form.gcode-file-input.file-upload form.gcode-file-input.file-upload
input(type="file", @change="upload", :disabled="!is_ready", input(type="file", @change="upload", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
select(title="Select previously uploaded GCode programs.",
v-model="state.selected",@change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px")
option(v-for="file in state.files", :value="file") {{file}}
br br
gcode-viewer gcode-viewer
button.submit-macros(title="Save Macros",@click="saveMacros(0)", button.submit-macros(title="Save Macros",@click="saveMacros(0)",