From 68f85ece67ab6fc8d96f80d772f2616333f80c6b Mon Sep 17 00:00:00 2001 From: Amanda Ghassaei <amandaghassaei@gmail.com> Date: Thu, 10 Sep 2015 16:09:20 -0400 Subject: [PATCH] input and output logged --- css/serialMonitor.css | 8 ++++++++ js/SerialMonitor/SerialMonitor.js | 2 +- js/SerialMonitor/SerialMonitorView.js | 6 +++++- js/menus/CommParentMenu.js | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/css/serialMonitor.css b/css/serialMonitor.css index 1bc878d6..662a7ace 100644 --- a/css/serialMonitor.css +++ b/css/serialMonitor.css @@ -42,4 +42,12 @@ position: absolute; margin-left: 10px; margin-top: 12px; + } + + span.incoming { + color: #999; + } + + span.outgoing { + font-weight:700; } \ No newline at end of file diff --git a/js/SerialMonitor/SerialMonitor.js b/js/SerialMonitor/SerialMonitor.js index cb2a7a0d..e2f623c0 100644 --- a/js/SerialMonitor/SerialMonitor.js +++ b/js/SerialMonitor/SerialMonitor.js @@ -8,7 +8,7 @@ define(['backbone'], function(Backbone){ var SerialMonitor = Backbone.Model.extend({ defaults: { - autoscroll: false + autoscroll: true } }); diff --git a/js/SerialMonitor/SerialMonitorView.js b/js/SerialMonitor/SerialMonitorView.js index 0e14802f..20c4697b 100644 --- a/js/SerialMonitor/SerialMonitorView.js +++ b/js/SerialMonitor/SerialMonitorView.js @@ -62,8 +62,12 @@ define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'text!SerialMoni $("#serialMonitorOutput").html(""); }, + __sendMessage: function(message){ + $("#serialMonitorOutput").append("<span class='outgoing'>" + message + "</span><br/>"); + }, + _updateIncomingMessage: function(){ - $("#serialMonitorOutput").append(serialComm.get("lastMessageReceived") + "<br/>"); + $("#serialMonitorOutput").append("<span class='incoming'>" + serialComm.get("lastMessageReceived") + "</span><br/>"); }, template: _.template(template) diff --git a/js/menus/CommParentMenu.js b/js/menus/CommParentMenu.js index 3d3d8de9..3d802d5e 100644 --- a/js/menus/CommParentMenu.js +++ b/js/menus/CommParentMenu.js @@ -37,6 +37,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm', 'commPlist' $("#sendSerialMessage").val(""); if (message == "") return; serialComm.send(message); + if (this.__sendMessage) this.__sendMessage(message); }, _updateIncomingMessage: function(){ -- GitLab