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

ui fix

Browse Source
This commit is contained in:
sanjayk03-dev
2024-03-28 16:08:06 +05:30
parent d445ebe0b5
commit 3f0bf4090a
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/macros.js
View File

@@ -199,11 +199,9 @@ module.exports = {
const macros = [...this.config.macros]; const macros = [...this.config.macros];
macros.splice(this.tab - 1, 1); macros.splice(this.tab - 1, 1);
const macros_list = macros.map(item => item.name); const macros_list = macros.map(item => item.name);
console.log(this.macrosName);
var macrosName = document.getElementById("macros-name").value;
var macrosColor = document.getElementById("macros-color").value; var macrosColor = document.getElementById("macros-color").value;
var macrosAlert = this.isChecked; var macrosAlert = this.isChecked;
const formattedFilename = macrosName const formattedFilename = this.macrosName
.replace(/\\/g, "_") .replace(/\\/g, "_")
.replace(/\//g, "_") .replace(/\//g, "_")
.replace(/#/g, "-") .replace(/#/g, "-")
@@ -222,7 +220,7 @@ module.exports = {
this.uploadGCode(file_name, file); this.uploadGCode(file_name, file);
} }
this.config.macros[this.tab - 1].name = macrosName; this.config.macros[this.tab - 1].name = this.macrosName;
this.config.macros[this.tab - 1].color = macrosColor; this.config.macros[this.tab - 1].color = macrosColor;
this.config.macros[this.tab - 1].file_name = file_name; this.config.macros[this.tab - 1].file_name = file_name;
this.config.macros[this.tab - 1].alert = macrosAlert; this.config.macros[this.tab - 1].alert = macrosAlert;

6
src/pug/templates/control-view.pug
View File

@@ -328,12 +328,12 @@ script#control-view-template(type="text/x-template")
option( selected='' value='Unorganized files') Unorganized files option( selected='' value='Unorganized files') Unorganized files
option(v-for="file in gcode_folders", :value="file") {{file}} option(v-for="file in gcode_folders", :value="file") {{file}}
button.config-button.button-blue(title="Create a new folder.", @click="create_folder=true", button.pure-button(title="Create a new folder.", @click="create_folder=true",
:disabled="!is_ready") :disabled="!is_ready")
.fa.fa-plus .fa.fa-plus
| Create Folder | Create Folder
button.config-button.button-blue(title="Upload a new folder.", @click="open_folder", button.pure-button(title="Upload a new folder.", @click="open_folder",
:disabled="!is_ready") :disabled="!is_ready")
.fa.fa-plus .fa.fa-plus
| Upload Folder | Upload Folder
@@ -343,7 +343,7 @@ script#control-view-template(type="text/x-template")
style="max-width:100%") style="max-width:100%")
option(v-for="file in gcode_files", :value="file") {{file}} option(v-for="file in gcode_files", :value="file") {{file}}
button.config-button.button-blue(title="Upload a new GCode program.", @click="open_file", button.pure-button(title="Upload a new GCode program.", @click="open_file",
:disabled="!is_ready") :disabled="!is_ready")
.fa.fa-plus .fa.fa-plus
| Upload File | Upload File