From 27758ff4beb92cb3342264b170f431eb221fbb35 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 10 Sep 2015 14:54:45 -0400
Subject: [PATCH] eod
---
js/SerialMonitor/SerialMonitorView.html | 5 +++++
js/SerialMonitor/SerialMonitorView.js | 15 +++++++++++----
js/SerialMonitor/index.html | 6 ++----
js/SerialMonitor/main.js | 23 +++++++++++++++++++++--
js/menus/CommParentMenu.js | 4 ++--
5 files changed, 41 insertions(+), 12 deletions(-)
create mode 100644 js/SerialMonitor/SerialMonitorView.html
diff --git a/js/SerialMonitor/SerialMonitorView.html b/js/SerialMonitor/SerialMonitorView.html
new file mode 100644
index 00000000..f1e4af19
--- /dev/null
+++ b/js/SerialMonitor/SerialMonitorView.html
@@ -0,0 +1,5 @@
+<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
diff --git a/js/SerialMonitor/SerialMonitorView.js b/js/SerialMonitor/SerialMonitorView.js
index c4b13713..1b035c78 100644
--- a/js/SerialMonitor/SerialMonitorView.js
+++ b/js/SerialMonitor/SerialMonitorView.js
@@ -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
diff --git a/js/SerialMonitor/index.html b/js/SerialMonitor/index.html
index 72d0ad00..8c5a15a6 100644
--- a/js/SerialMonitor/index.html
+++ b/js/SerialMonitor/index.html
@@ -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
diff --git a/js/SerialMonitor/main.js b/js/SerialMonitor/main.js
index 41e8ab13..922150d1 100644
--- a/js/SerialMonitor/main.js
+++ b/js/SerialMonitor/main.js
@@ -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
diff --git a/js/menus/CommParentMenu.js b/js/menus/CommParentMenu.js
index aa4fd434..1395302d 100644
--- a/js/menus/CommParentMenu.js
+++ b/js/menus/CommParentMenu.js
@@ -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({
--
GitLab