From 393f000ffb0b83177169ce5e1af4b9961b1965a1 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 19 Jun 2015 14:45:51 -0700
Subject: [PATCH] ui stuff

---
 assets/imgs/refreshIcon.png   | Bin 0 -> 3521 bytes
 css/main.css                  |   8 ++++++++
 js/menus/MenuWrapperView.js   |   1 +
 js/menus/SetupCommMenuView.js |   9 +++++----
 js/models/PList.js            |   1 -
 5 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 assets/imgs/refreshIcon.png

diff --git a/assets/imgs/refreshIcon.png b/assets/imgs/refreshIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..33d7c2ec4d1696119b1b381c0e5a65c2487af223
GIT binary patch
literal 3521
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
VOwBL9XJBAp@O1TaS?83{1OS?0w`2eS

literal 0
HcmV?d00001

diff --git a/css/main.css b/css/main.css
index cea8b3f2..a1aeaa79 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 3de9f0de..78cf9dae 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 54112810..ea3930ff 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>\
-            &nbsp;&nbsp;<a href="#" id="refreshPorts" class="btn btn-lg btn-default"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span></a><br/><br/>\
+            &nbsp;&nbsp;<a href="#" id="refreshPorts" class="btn btn-lg btn-default btn-icon"><img src="assets/imgs/refreshIcon.png"></a><br/><br/>\
         Incoming: &nbsp;&nbsp;<pre id="incomingSerialMessage"></pre><br/><br/>\
         Stream: &nbsp;&nbsp;<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 56037f79..28aa1585 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"
             }
         },
-- 
GitLab