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

fixing textarea and dialog box

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-10 01:28:51 +05:30
parent 52511b18fa
commit e3d1f61980
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/macros.js
View File

@@ -35,7 +35,7 @@ module.exports = {
}, },
methods: { methods: {
updateNewGcode(event) { updateNewGcode(event) {
console.log(event) console.log(event);
this.newGcode = event.target.value; this.newGcode = event.target.value;
console.log(this.newGcode); console.log(this.newGcode);
}, },
@@ -58,9 +58,9 @@ module.exports = {
} }
const file = files[0]; const file = files[0];
console.log(file) console.log(file);
const extension = file.name.split(".").pop(); const extension = file.name.split(".").pop();
console.log(extension) console.log(extension);
switch (extension.toLowerCase()) { switch (extension.toLowerCase()) {
case "nc": case "nc":
case "ngc": case "ngc":
@@ -132,7 +132,7 @@ module.exports = {
gcode_file_time: 0, gcode_file_time: 0,
}, },
{ {
name: "Spindle WarmUp", name: "Spindle Warmup",
color: "#e6e6e6", color: "#e6e6e6",
gcode_file_name: " ", gcode_file_name: " ",
gcode_file_time: 0, gcode_file_time: 0,

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

@@ -16,9 +16,8 @@ script#macros-template(type="text/x-template")
p Are you sure you want to save the current settings? p Are you sure you want to save the current settings?
div(slot="footer") div(slot="footer")
button.pure-button(@click="confirmSave=false") Cancel button.pure-button(@click="confirmSave=false") Cancel
button.pure-button.pure-button-primary(@click="saveMacros") button.pure-button.pure-button-primary(@click="saveMacros") Confirm
| Confirm
h1 Macros Configuration h1 Macros Configuration
button.pure-button(title="Reset Macros", @click="confirmReset=true", button.pure-button(title="Reset Macros", @click="confirmReset=true",
@@ -64,7 +63,7 @@ script#macros-template(type="text/x-template")
select#gcodeSelect-0(title="Select previously uploaded GCode programs.",selected select#gcodeSelect-0(title="Select previously uploaded GCode programs.",selected
v-model="state.selected",@change="load", :disabled="!is_ready", v-model="state.selected",@change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px") style="max-width:100%;height:40px;border-radius:5px")
option(disabled='' selected='' value='default') Select an option option(disabled='false' selected='' value='default') Select an option
option(v-for="file in state.files", :value="file") {{file}} 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",
@@ -76,7 +75,7 @@ script#macros-template(type="text/x-template")
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
.gcodeContainer .gcodeContainer
textarea.new-gcode( v-if="state.selected=='default",:value='newGcode' @input="updateNewGcode") textarea.new-gcode( v-if="state.selected=='default'",:value='newGcode' @input="updateNewGcode")
gcode-viewer(v-if="state.selected !== 'default'") gcode-viewer(v-if="state.selected !== 'default'")
button.submit-macros(title="Save Macros",@click="confirmSave=true", button.submit-macros(title="Save Macros",@click="confirmSave=true",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save