serial monitor setup changes

040be371 · Amanda Ghassaei · 7e01629b · 040be371 · 040be371 · 040be371
Commit 040be371 authored Sep 09, 2015 by Amanda Ghassaei
--- a/css/serialMonitor.css
+++ b/css/serialMonitor.css
-  #serialMonitorSend {
+  #sendSerialMessage {
    position: absolute;
    bottom: 0px;
    border-radius: 0px;
    border: none;
    border-top: 2px solid #bdc3c7;
  }
+
+  #serialMonitorOutput {
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    padding: 10px 20px 100px 20px;
+    font-family: Courier, monospace;
+    font-size: 13px;
+    line-height: 25px;
+  }
+
+  #serialMonitorView {
+      overflow: hidden;
+  }
\ No newline at end of file
--- a/js/SerialMonitor/SerialMonitor.js
+++ b/js/SerialMonitor/SerialMonitor.js
+/**
+ * Created by aghassaei on 9/9/15.
+ */
+
+
+define(['backbone'], function(Backbone){
+
+    return Backbone.Model.extend({
+
+        defaults: {
+            autoscroll: true
+        }
+
+    });
+});
\ No newline at end of file
--- a/js/menus/SerialMonitorController.js
+++ b/js/menus/SerialMonitorController.js
@@ -23,7 +23,7 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone){
                this.popup.focus();
                return;
            }
-            this.popup = window.open('SerialMonitor.html', '', 'height=400, width=400, titlebar=no, toolbar=no, menubar=yes, scrollbars=no, resizable=yes, location=no, directories=no, status=no');
+            this.popup = window.open('js/SerialMonitor/index.html', '', 'height=400, width=400, titlebar=no, toolbar=no, menubar=yes, scrollbars=no, resizable=yes, location=no, directories=no, status=no');
            var self = this;
            $(this.popup).unload(function(){
                self.onClose();

--- a/js/SerialMonitor/SerialMonitorView.js
+++ b/js/SerialMonitor/SerialMonitorView.js
+/**
+ * Created by aghassaei on 9/9/15.
+ */
+
+
+define(['jquery', 'underscore', 'backbone'], function($, _, Backbone){
+
+    return Backbone.View.extend({
+
+        el: "#serialMonitorView",
+
+        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/>");
+        }
+
+    });
+});
\ No newline at end of file
--- a/SerialMonitor.html
+++ b/SerialMonitor.html
@@ -2,13 +2,13 @@
    <title>Serial Monitor</title>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="dependencies/flatUI/css/vendor/bootstrap.min.css" rel="stylesheet"><!-- Loading Bootstrap -->
-    <link href="dependencies/flatUI/css/flat-ui.css" rel="stylesheet"><!-- Loading Flat UI -->
-    <link href="css/serialMonitor.css" rel="stylesheet"><!-- Loading custom stylingI -->
-    <script data-main="js/menus/SerialMonitorView" src="dependencies/require/require.js"></script>
+    <link href="../../dependencies/flatUI/css/vendor/bootstrap.min.css" rel="stylesheet"><!-- Loading Bootstrap -->
+    <link href="../../dependencies/flatUI/css/flat-ui.css" rel="stylesheet"><!-- Loading Flat UI -->
+    <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">
-    serial monitor
+    <div id="serialMonitorOutput"></div>
    <input id="sendSerialMessage" value="" placeholder="Send Message" class="form-control" type="text">
 </div>
 </html>
\ No newline at end of file
--- a/js/SerialMonitor/main.js
+++ b/js/SerialMonitor/main.js
+/**
+ * Created by aghassaei on 9/9/15.
+ */
+
+
+require.config({
+
+    paths: {
+        jquery: '../../dependencies/jquery-2.1.3',
+        underscore: '../../dependencies/underscore',
+        backbone: '../../dependencies/backbone',
+        serialMonitor: 'SerialMonitor',
+        serialMonitorView: 'SerialMonitorView'
+    }
+
+});
+
+console.log("herefsdf");
+require(['serialMonitorView', 'serialMonitor'], function(SerialMonitorView, SerialMonitor){
+    new SerialMonitorView({model: new SerialMonitor()});
+});
\ No newline at end of file
--- a/js/main.js
+++ b/js/main.js
@@ -142,7 +142,7 @@ require.config({
        assemblerSetupMenu: 'menus/AssemblerSetupMenuView',
        editComponentMenu: 'menus/EditComponentMenuView',
        commParentMenu: 'menus/CommParentMenu',
-        serialMonitorController: 'menus/SerialMonitorController',
+        serialMonitorController: 'SerialMonitor/SerialMonitorController',

        //templates
        navViewMenuTemplate: 'menus/templates/NavViewMenu.html',

--- a/js/menus/SerialMonitorView.js
+++ b/js/menus/SerialMonitorView.js
-/**
- * Created by aghassaei on 9/9/15.
- */
-
-require.config({
-
-    baseUrl: 'js',
-
-    paths: {
-        jquery: '../dependencies/jquery-2.1.3',
-        underscore: '../dependencies/underscore',
-        backbone: '../dependencies/backbone'
-    },
-
-    shim: {
-        three: {
-            exports: 'THREE'
-        },
-        orbitControls: {
-            deps: ['three'],
-            exports: 'THREE'
-        },
-        stlLoader: {
-            deps: ['three'],
-            exports: 'THREE'
-        },
-        fileSaverLib: {
-            exports: 'saveAs'
-        },
-        flatUI: {
-            deps: ['jquery']
-        },
-        bootstrapSlider:{
-            deps: ['jquery'],
-            exports: '$'
-        },
-        'socketio': {
-            exports: 'io'
-        },
-        'numeric': {
-            exports: 'numeric'
-        }
-    }
-
-});
-
-console.log("hi");
-
-require(['jquery', 'underscore', 'backbone'], function($, _, Backbone){
-
-    console.log("here45");
-
-    var SerialMonitorView = Backbone.View.extend({
-
-        el: "#serialMonitorView",
-
-        initialize: function(){
-            $("#serialMonitorView").html("working");
-        }
-
-    });
-
-    new SerialMonitorView();
-});
\ No newline at end of file