From 933833f94b9f110a05fea8db376240cc74ed89da Mon Sep 17 00:00:00 2001 From: m4rcSA <43429867+m4rcSA@users.noreply.github.com> Date: Sun, 14 Jul 2019 04:47:35 +0200 Subject: [PATCH] added + - . signs as possible values in macros added + - . signs as possible values in macro commands Example: TESTZ Z={label:Z, default:-.1} --- octoprint_klipper/static/js/klipper_param_macro.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octoprint_klipper/static/js/klipper_param_macro.js b/octoprint_klipper/static/js/klipper_param_macro.js index bd1507d..d014a66 100644 --- a/octoprint_klipper/static/js/klipper_param_macro.js +++ b/octoprint_klipper/static/js/klipper_param_macro.js @@ -14,7 +14,7 @@ $(function() { self.macroName = ko.observable(); var paramObjRegex = /{(.*?)}/g; - var keyValueRegex = /(\w*)\s*:\s*([\w\s°"|]*)/g; + var keyValueRegex = /(\w*)\s*:\s*([\w\s°"|+\-\.]*)/g; self.process = function(macro) { self.macro = macro.macro();