diff --git a/assets/imgs/refreshIcon.png b/assets/imgs/refreshIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..33d7c2ec4d1696119b1b381c0e5a65c2487af223 Binary files /dev/null and b/assets/imgs/refreshIcon.png differ diff --git a/css/main.css b/css/main.css index cea8b3f21101f47cfd68f104169ac66b2834f395..a1aeaa79c7513e1f0a43e9a438d043cab8b7e9d5 100644 --- a/css/main.css +++ b/css/main.css @@ -29,6 +29,14 @@ pre { color: #ccc; } +.btn { + height:45px; +} + +.btn-icon{ + padding:9px; +} + .navMenu { display: none; z-index: 1; diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js index 3de9f0de1bd036b836b86c3081548996f5bc53cb..78cf9dae4a8e541124030c57a2900bf7b8e7d30a 100644 --- a/js/menus/MenuWrapperView.js +++ b/js/menus/MenuWrapperView.js @@ -43,6 +43,7 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice'], function($, _, this._renderTab(); return; } + if ($(".floatInput").is(":focus")) this._updateFloat(e); if ($(".intInput").is(":focus")) this._updateInt(e); if ($(".textInput").is(":focus")) this._updateString(e) diff --git a/js/menus/SetupCommMenuView.js b/js/menus/SetupCommMenuView.js index 54112810ce42141877dfb8d3c3d6640e7522d772..ea3930ff691cdf57cad3a62e827ffa3e2f686f04 100644 --- a/js/menus/SetupCommMenuView.js +++ b/js/menus/SetupCommMenuView.js @@ -12,9 +12,9 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm'], function($ events: { "click #serialFlushBuffer": "_flushBuffer", - "click #sendTestMessage": "_sendTestMessage", "click #nodeSetupInstructions": "_setupInstructions", - "click #refreshPorts": "_refreshPorts" + "click #refreshPorts": "_refreshPorts", + "change #seriallTestMessage": "_sendTestMessage" }, @@ -29,6 +29,8 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm'], function($ _sendTestMessage: function(e){ e.preventDefault(); var message = $("#seriallTestMessage").val(); + $("#seriallTestMessage").val(""); + if (message == "") return; serialComm.send(message); }, @@ -96,10 +98,9 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm'], function($ <% }); %>\ </ul>\ </div>\ - <a href="#" id="refreshPorts" class="btn btn-lg btn-default"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span></a><br/><br/>\ + <a href="#" id="refreshPorts" class="btn btn-lg btn-default btn-icon"><img src="assets/imgs/refreshIcon.png"></a><br/><br/>\ Incoming: <pre id="incomingSerialMessage"></pre><br/><br/>\ Stream: <span id="serialDataStream"></span>\ - <a href="#" id="sendTestMessage" class="btn btn-block btn-lg btn-default">Send Test Message:</a><br/>\ <input id="seriallTestMessage" value="<%= testMessage %>" placeholder="Test Message" class="form-control fullWidth unresponsiveInput" type="text"><br/><br/>\ <a href="#" id="serialFlushBuffer" class="btn btn-block btn-lg btn-danger">Flush Buffer</a><br/>\ <% }else{ %>\ diff --git a/js/models/PList.js b/js/models/PList.js index 56037f79ba85c46a63a7e9df99e44bd46dc6c9b6..28aa1585472b0890cc8bd73a170a70603e420f53 100644 --- a/js/models/PList.js +++ b/js/models/PList.js @@ -29,7 +29,6 @@ define(['three'], function(THREE){ }, navComm:{ setupComm: "Setup", - discovery: "Discovery", send: "Send" } },