From 5bee98edef5b621f7e7a208d5067beab128db0c6 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Mon, 22 Jan 2024 03:35:53 +0530 Subject: [PATCH] fixing template --- src/js/macros.js | 3 +++ src/pug/templates/macros.pug | 2 ++ src/resources/config-template.json | 7 ++----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/js/macros.js b/src/js/macros.js index 0f0f3f4..24e604c 100644 --- a/src/js/macros.js +++ b/src/js/macros.js @@ -226,5 +226,8 @@ module.exports = { printState: function () { console.log(this.state); }, + printConfig: function () { + console.log(this.config); + }, }, }; diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug index 6c6a3e5..9da5083 100644 --- a/src/pug/templates/macros.pug +++ b/src/pug/templates/macros.pug @@ -295,3 +295,5 @@ script#macros-template(type="text/x-template") button.submit-macros(title="Cancel Macros",@click="printState", style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Print State + button.submit-macros(title="Cancel Macros",@click="printConfig", + style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Print Config diff --git a/src/resources/config-template.json b/src/resources/config-template.json index 2008622..04554d2 100644 --- a/src/resources/config-template.json +++ b/src/resources/config-template.json @@ -645,9 +645,7 @@ } }, - "macrosList": { - "type": "list", - "default": [ + "macrosList": [ "FireLaser.ngc", "GoHomeXYZ.ngc", "ParkRearRightWW.ngc", @@ -656,8 +654,7 @@ "TurnOffSpindleAndLaser.ngc", "VacOn.ngc", "TurnOffVac.ngc" - ] - }, + ], "admin": { "auto-check-upgrade": {