Commit 52785efe authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

serial monitor working

parent 27758ff4
......@@ -3,21 +3,28 @@
*/
define(['jquery', 'underscore', 'commParentMenu', 'text!SerialMonitorView.html'], function($, _, CommParentMenu, template){
define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'text!SerialMonitorView.html'],
function($, _, CommParentMenu, serialComm, template){
return CommParentMenu.extend({
el: "#serialMonitorView",
events: {
},
__initialize: function(){
$("#serialMonitorOutput").html("flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>)flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>)flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>");
this.render();
},
_makeTemplateJSON: function(){
console.log("render");
return this.model.toJSON();
},
_updateIncomingMessage: function(){
$("#serialMonitorOutput").append(serialComm.get("lastMessageReceived") + "<br/>");
},
template: _.template(template)
});
......
......@@ -32,7 +32,6 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm', 'commPlist'
},
_sendMessage: function(e){
console.log("here");
e.preventDefault();
var message = $("#sendSerialMessage").val();
$("#sendSerialMessage").val("");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment