Commit 27758ff4 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

eod

parent edff6a0c
<div id="serialMonitorOutput"></div>
<div id="controlPanel">
</div>
<input id="sendSerialMessage" value="" placeholder="Send Message" class="form-control" type="text">
\ No newline at end of file
......@@ -3,15 +3,22 @@
*/
define(['jquery', 'underscore', 'backbone'], function($, _, Backbone){
define(['jquery', 'underscore', 'commParentMenu', 'text!SerialMonitorView.html'], function($, _, CommParentMenu, template){
return Backbone.View.extend({
return CommParentMenu.extend({
el: "#serialMonitorView",
initialize: function(){
__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/>");
}
},
_makeTemplateJSON: function(){
console.log("render");
return this.model.toJSON();
},
template: _.template(template)
});
});
\ No newline at end of file
......@@ -7,8 +7,6 @@
<link href="../../css/serialMonitor.css" rel="stylesheet"><!-- Loading custom stylingI -->
<script data-main="main" src="../../dependencies/require/require.js"></script>
</head>
<html><div id="serialMonitorView">
<div id="serialMonitorOutput"></div>
<input id="sendSerialMessage" value="" placeholder="Send Message" class="form-control" type="text">
</div>
<html>
<div id="serialMonitorView"></div>
</html>
\ No newline at end of file
......@@ -9,13 +9,32 @@ require.config({
jquery: '../../dependencies/jquery-2.1.3',
underscore: '../../dependencies/underscore',
backbone: '../../dependencies/backbone',
text: '../../dependencies/require/text',
three: '../../dependencies/three',
socketio: '../../dependencies/socket.io-1.3.5',
serialMonitor: 'SerialMonitor',
serialMonitorView: 'SerialMonitorView'
serialMonitorView: 'SerialMonitorView',
menuParent: '../menus/MenuParentView',
commParentMenu: '../menus/CommParentMenu',
plist: '../plists/PList',
commPlist: '../plists/commPlist',
serialComm: '../models/SerialComm'
},
shim: {
three: {
exports: 'THREE'
},
'socketio': {
exports: 'io'
}
}
});
console.log("herefsdf");
require(['serialMonitorView', 'serialMonitor'], function(SerialMonitorView, SerialMonitor){
new SerialMonitorView({model: new SerialMonitor()});
});
\ No newline at end of file
......@@ -4,8 +4,8 @@
define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm', 'text!setupCommMenuTemplate', 'commPlist'],
function($, _, MenuParentView, plist, serialComm, template, commPlist){
define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm', 'commPlist'],
function($, _, MenuParentView, plist, serialComm, commPlist){
return MenuParentView.extend({
......
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