Merge commit '4fc646598a0c47fb75432d6a407fda2f6b0debb9' into devel

octoprint_klipper/static/js/klipper_param_macro.js

@@ -4,38 +4,38 @@
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
 // License, or (at your option) any later version.
- 
+
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU Affero General Public License for more details.
- 
+
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 $(function() {
     function KlipperMacroDialogViewModel(parameters) {
         var self = this;
-        
+
         self.parameters = ko.observableArray();
         self.interpolatedCmd;
         self.macro;
         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();
            self.macroName(macro.name());
-           
+
            var matches = self.macro.match(paramObjRegex);
            var params = [];
-           
+
            for (var i=0; i < matches.length; i++) {
               var obj = {};
               var res = keyValueRegex.exec(matches[i]);
-              
+
               while (res != null) {
                  if("options" == res[1]) {
                     obj["options"] = res[2].trim().split("|");
@@ -44,32 +44,32 @@ $(function() {
                  }
                  res = keyValueRegex.exec(matches[i]);
               }
-              
+
               if(!("label" in obj)) {
                  obj["label"] = "Input " + (i+1);
               }
-              
+
               if(!("unit" in obj)) {
                  obj["unit"] = "";
               }
-              
+
               if("default" in obj) {
                  obj["value"] = obj["default"];
               }
-              
+
               params.push(obj);
            }
            self.parameters(params);
         }
-        
+
         self.executeMacro = function() {
            var i=-1;
-           
+
            function replaceParams(match) {
               i++;
               return self.parameters()[i]["value"];
            }
-           // Use .split to create an array of strings which is sent to 
+           // Use .split to create an array of strings which is sent to
            // OctoPrint.control.sendGcode instead of a single string.
            expanded = self.macro.replace(paramObjRegex, replaceParams)
            expanded = expanded.split(/\r\n|\r|\n/);