From c3cbf9405009b167f3b95a8a21c86c16b9a502b8 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sun, 21 Jun 2015 11:27:01 -0700
Subject: [PATCH] eod
---
js/menus/SetupCommMenuView.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/js/menus/SetupCommMenuView.js b/js/menus/SetupCommMenuView.js
index b02de02a..57e2e3a7 100644
--- a/js/menus/SetupCommMenuView.js
+++ b/js/menus/SetupCommMenuView.js
@@ -22,7 +22,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm'], function($
_initialize: function(){
this.listenTo(serialComm, "change", this.render);
- this.listenTo(serialComm, "change:lastMessageReceived", this._updateIncomingMesage);
+ this.listenTo(serialComm, "change:lastMessageReceived", this._updateIncomingMessage);
this.inTimeout = false;
},
@@ -35,9 +35,10 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm'], function($
serialComm.send(message);
},
- _updateIncomingMesage: function(){
+ _updateIncomingMessage: function(){
var message = serialComm.get("lastMessageReceived");
var $message = $("#incomingSerialMessage");
+ console.log(message);
$message.html(message);
$message.css("background", "#ffff99");
if (!this.inTimeout) {
@@ -104,7 +105,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm'], function($
</ul>\
</div>\
<a href="#" id="refreshPorts" class="btn btn-lg btn-default btn-icon"><img src="assets/imgs/refreshIcon.png"></a><br/><br/>\
- Incoming: <pre id="incomingSerialMessage"></pre><br/><br/>\
+ Incoming: <pre id="incomingSerialMessage"></pre><br/>\
<input id="seriallTestMessage" value="<%= testMessage %>" placeholder="Send Message" class="form-control fullWidth unresponsiveInput" type="text"><br/><br/>\
<a href="#" id="serialFlushBuffer" class="btn btn-block btn-lg btn-danger">Flush Buffer</a><br/>\
<% }else{ %>\
--
GitLab