From 677d33e44818ff326850d7771d1b6070d3e7aa7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 25 Nov 2013 11:46:24 +0100 Subject: [PATCH] Fixed sending of command again. Also now make g and m codes appear in uppercase automatically. --- .../static/js/app/viewmodels/terminal.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/octoprint/static/js/app/viewmodels/terminal.js b/src/octoprint/static/js/app/viewmodels/terminal.js index 01eab23b..54361af6 100644 --- a/src/octoprint/static/js/app/viewmodels/terminal.js +++ b/src/octoprint/static/js/app/viewmodels/terminal.js @@ -89,18 +89,17 @@ function TerminalViewModel(loginStateViewModel, settingsViewModel) { } self.sendCommand = function() { - /* - var re = /^([gm][0-9]+)(\s.*)?/; - var commandMatch = command.match(re); - if (commandMatch != null) { - command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2] : ""); - } - */ - var command = self.command(); + + var re = /^([gm][0-9]+)(\s.*)?/; + var commandMatch = command.match(re); + if (commandMatch != null) { + command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2] : ""); + } + if (command) { $.ajax({ - url: AJAX_BASEURL + "control/command", + url: AJAX_BASEURL + "control/printer/command", type: "POST", dataType: "json", contentType: "application/json; charset=UTF-8",