Commit 040be371 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

serial monitor setup changes

parent 7e01629b
#serialMonitorSend { #sendSerialMessage {
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
border-radius: 0px; border-radius: 0px;
border: none; border: none;
border-top: 2px solid #bdc3c7; 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
/**
* Created by aghassaei on 9/9/15.
*/
define(['backbone'], function(Backbone){
return Backbone.Model.extend({
defaults: {
autoscroll: true
}
});
});
\ No newline at end of file
...@@ -23,7 +23,7 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone){ ...@@ -23,7 +23,7 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone){
this.popup.focus(); this.popup.focus();
return; 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; var self = this;
$(this.popup).unload(function(){ $(this.popup).unload(function(){
self.onClose(); self.onClose();
......
/**
* 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
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<title>Serial Monitor</title> <title>Serial Monitor</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <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/vendor/bootstrap.min.css" rel="stylesheet"><!-- Loading Bootstrap -->
<link href="dependencies/flatUI/css/flat-ui.css" rel="stylesheet"><!-- Loading Flat UI --> <link href="../../dependencies/flatUI/css/flat-ui.css" rel="stylesheet"><!-- Loading Flat UI -->
<link href="css/serialMonitor.css" rel="stylesheet"><!-- Loading custom stylingI --> <link href="../../css/serialMonitor.css" rel="stylesheet"><!-- Loading custom stylingI -->
<script data-main="js/menus/SerialMonitorView" src="dependencies/require/require.js"></script> <script data-main="main" src="../../dependencies/require/require.js"></script>
</head> </head>
<html><div id="serialMonitorView"> <html><div id="serialMonitorView">
serial monitor <div id="serialMonitorOutput"></div>
<input id="sendSerialMessage" value="" placeholder="Send Message" class="form-control" type="text"> <input id="sendSerialMessage" value="" placeholder="Send Message" class="form-control" type="text">
</div> </div>
</html> </html>
\ No newline at end of file
/**
* 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
...@@ -142,7 +142,7 @@ require.config({ ...@@ -142,7 +142,7 @@ require.config({
assemblerSetupMenu: 'menus/AssemblerSetupMenuView', assemblerSetupMenu: 'menus/AssemblerSetupMenuView',
editComponentMenu: 'menus/EditComponentMenuView', editComponentMenu: 'menus/EditComponentMenuView',
commParentMenu: 'menus/CommParentMenu', commParentMenu: 'menus/CommParentMenu',
serialMonitorController: 'menus/SerialMonitorController', serialMonitorController: 'SerialMonitor/SerialMonitorController',
//templates //templates
navViewMenuTemplate: 'menus/templates/NavViewMenu.html', navViewMenuTemplate: 'menus/templates/NavViewMenu.html',
......
/**
* 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
Supports Markdown
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