diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js index 39e7870e776da6eaa8d3b0bd0811509980a2888d..ac59d3146fb85658b8bbf446abc8d7e242ad69d2 100644 --- a/js/menus/MenuWrapperView.js +++ b/js/menus/MenuWrapperView.js @@ -46,9 +46,18 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex } if ($(".floatInput").is(":focus")) this._updateFloat(e); - if ($(".intInput").is(":focus")) this._updateInt(e); - if ($(".textInput").is(":focus")) this._updateString(e); - if ($(".hexInput").is(":focus")) this._updateHex(e); + else if ($(".intInput").is(":focus")) this._updateInt(e); + else if ($(".textInput").is(":focus")) this._updateString(e); + else if ($(".hexInput").is(":focus")) this._updateHex(e); + + else if (!$("input").is(":focus") && e.keyCode == 77 && (e.ctrlKey || e.metaKey) && e.shiftKey && appState.get("currentNav") == "navComm"){ + e.preventDefault(); + require(['serialComm'], function(serialComm){ + serialComm.openSerialMonitor(); + }); + } + console.log(e); + }, _updateString: function(e){ diff --git a/js/menus/SendMenuView.js b/js/menus/SendMenuView.js index f47b837bdee591fdb3874ee99784e0e601fc243a..85eefd678c5d35bd494ccae7e9184774efc97f51 100644 --- a/js/menus/SendMenuView.js +++ b/js/menus/SendMenuView.js @@ -2,10 +2,10 @@ * Created by aghassaei on 3/11/15. */ -define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'commPlist', 'text!sendMenuTemplate', 'cam', 'camPlist'], - function($, _, CommParentMenu, serialComm, commPlist, template, cam, camPlist){ +define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!sendMenuTemplate', 'cam', 'camPlist'], + function($, _, MenuParent, serialComm, commPlist, template, cam, camPlist){ - return CommParentMenu.extend({ + return MenuParent.extend({ events: { diff --git a/js/menus/SetupCommMenuView.js b/js/menus/SetupCommMenuView.js index cd8531ae11971ec6e1c0884209e91fdd544f49e0..919c6b0d4632cf7f6ed56b746857ffdf11faa578 100644 --- a/js/menus/SetupCommMenuView.js +++ b/js/menus/SetupCommMenuView.js @@ -17,7 +17,6 @@ define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'text!setupCommM "click #openSerialMonitor": "_openSerialMonitor" }, - __initialize: function(){ }, diff --git a/js/menus/templates/NavViewMenu.html b/js/menus/templates/NavViewMenu.html index 49ca72b5298ad95e79fb5a9e8e80c95619d4d672..48c1613497e48819a9d738b65b99d1c84a2da1b2 100644 --- a/js/menus/templates/NavViewMenu.html +++ b/js/menus/templates/NavViewMenu.html @@ -3,7 +3,7 @@ <ul class="dropdown-menu"> <li><a class="appState boolProperty" data-property="menuIsVisible" href="#">Menu</a></li> <li><a class="appState boolProperty" data-property="scriptIsVisible" href="#">Script</a></li> - <li><a class="appState boolProperty" data-property="consoleIsVisible" href="#">Console</a></li> + <!--<li><a class="appState boolProperty" data-property="consoleIsVisible" href="#">Console</a></li>--> <li><a class="appState boolProperty" data-property="ribbonIsVisible" href="#">Ribbon</a></li> </ul> </li> diff --git a/js/menus/templates/SendMenuView.html b/js/menus/templates/SendMenuView.html index 1ec28eb65eec66b3aa25a7bade76b1df3bd4d8d8..f71756ed1d6153aea4d2de0e8f8ca60adc6649bb 100644 --- a/js/menus/templates/SendMenuView.html +++ b/js/menus/templates/SendMenuView.html @@ -9,8 +9,6 @@ <a href="#" id="streamCommands" class="btn btn-block btn-lg btn-success">Stream</a> <% } %> <br/> - Incoming: <pre id="incomingSerialMessage"><%= lastMessageReceived %></pre><br/><br/> - Out: <input id="sendSerialMessage" value="" placeholder="Send Message" class="seventyFiveWidth form-control unresponsiveInput" type="text"><br/><br/> Next Line: <input id="nextLine" value="" placeholder="##" class="intInput form-control unresponsiveInput" type="text"> <a href="#" id="previousLineButton" class="btn btn-lg btn-default">Prev</a> <a href="#" id="nextLineButton" class="btn btn-lg btn-default">Next</a><br/><br/> diff --git a/js/models/AppState.js b/js/models/AppState.js index a55d2494b1efc2696b4e01d358808681a1d61726..158fe6bbbfccc1a2005186677f5f06091481a993 100644 --- a/js/models/AppState.js +++ b/js/models/AppState.js @@ -25,7 +25,7 @@ define(['underscore', 'backbone', 'threeModel', 'three', 'plist', 'globals'], fu basePlaneIsVisible:true, highlighterIsVisible:true, axesAreVisible: false, - focusOnLattice: true, + focusOnLattice: false, //key bindings shift: false, diff --git a/js/models/SerialComm.js b/js/models/SerialComm.js index 68c0ee4abf328800df93ab26644918d4eee51855..cc43830aa8f97a4c55d66dc84085c2aee8912c61 100644 --- a/js/models/SerialComm.js +++ b/js/models/SerialComm.js @@ -53,6 +53,10 @@ define(['underscore', 'backbone', 'socketio'], function(_, Backbone, io){ }, openSerialMonitor: function(){ + if (!this.get("connected")) { + console.warn("can't open serial monitor if not connected to node server"); + return; + } require(['serialMonitorController'], function(serialMonitorController){ serialMonitorController.open(); });