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

changed null to empty string

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-02 15:06:13 +05:30
parent 06b1cde647
commit 7302c955de
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/control-view.js
View File

@@ -203,7 +203,7 @@ module.exports = {
return Math.min(1, p); return Math.min(1, p);
}, },
isMacrosPresent: function(val){ isMacrosPresent: function(val){
return this.config.macros[val].name=null; return this.config.macros[val].name!="" || this.config.macros[val].gcode!="";
}, },
}, },

42
src/resources/config-template.json
View File

@@ -590,39 +590,39 @@
"default":[ "default":[
{ {
"id" : 1, "id" : 1,
"name" : null, "name" : "",
"color":null, "color":"#d9d9d9",
"gcode":null "gcode":""
}, },
{ {
"id" : 2, "id" : 2,
"name" : null, "name" : "",
"color":null, "color":"#d9d9d9",
"gcode":null "gcode":""
}, },
{ {
"id" : 3, "id" : 3,
"name" : null, "name" : "",
"color":null, "color":"#d9d9d9",
"gcode":null "gcode":""
}, },
{ {
"id" : 4, "id" : 4,
"name" : null, "name" : "",
"color":null, "color":"#d9d9d9",
"gcode":null "gcode":""
}, },
{ {
"id" : 5, "id" : 5,
"name" : null, "name" : "",
"color":null, "color":"#d9d9d9",
"gcode":null "gcode":""
}, },
{ {
"id" : 6, "id" : 6,
"name" : null, "name" : "",
"color":null, "color":"#d9d9d9",
"gcode":null "gcode":""
} }
], ],
"template": { "template": {
@@ -631,15 +631,15 @@
}, },
"name": { "name": {
"type": "text", "type": "text",
"default": null "default": ""
}, },
"color": { "color": {
"type": "text", "type": "text",
"default":null "default":""
}, },
"gcode": { "gcode": {
"type": "text", "type": "text",
"default":null "default":""
} }
} }
}, },