Browse Source

Merge branch 'master' into progress-ui

Andrew Chalkley 9 năm trước cách đây
mục cha
commit
98d6eca7a8
3 tập tin đã thay đổi với 15 bổ sung13 xóa
  1. 2 0
      front-end/css/style.css
  2. 12 11
      front-end/index.html
  3. 1 2
      front-end/js/app.js

+ 2 - 0
front-end/css/style.css

@@ -9,6 +9,7 @@ body {
     background: #00B7FF;
     width: 0%;
     height: 10px;
+    float:left;
 }
 
 button {
@@ -20,6 +21,7 @@ button {
   padding: 10px 20px 10px 20px;
   text-decoration: none;
   border:0;
+    float: left;
 }
 
 button:hover {

+ 12 - 11
front-end/index.html

@@ -7,22 +7,23 @@
 </head>
 <body>
     <label for="ports">Select Port:</label>
-    <select title="Select a Serial/COM Port" id="ports" name="ports" class="form-control" disabled>
+    <select title="Select a Serial/COM Port" id="ports" name="ports" disabled>
+
+    </select>
+
+    <label for="manifests">Select Binaries to Flash:</label>
+    <select title="Select Binaries to Flash" id="manifests" name="manifests" disabled>
+
     </select>
 
-            <label for="manifests">Select Binaries to Flash:</label>
-            <select title="Select Binaries to Flash" id="manifests" name="manifests" class="form-control" disabled>
-            
-            </select>
 
-    
-    <button id="flash-button" class="btn btn-primary pull-right" disabled>
-                Flash!
+    <button id="flash-button" disabled>
+        Flash!
     </button>
+
     <div id="progress"></div>
-    <footer>
-        <span id="status"></span>
-    </footer>
+
+    <footer><span id="status"></span></footer>
 
 <!-- Javascript -->
 <script src="js/app.js" charset="utf-8"></script>

+ 1 - 2
front-end/js/app.js

@@ -172,7 +172,6 @@ function flashWithManifest(manifest) {
             appStatus.textContent = `Flashing ${portsSelect.value}...Opened Port.`;
             updateProgressBar(0);
             let promise = Promise.resolve();
-            flashSpec.forEach(createProgressBars);
             return esp.flashSpecifications(flashSpec)
                 .then(() => esp.close())
                 .then((result) => {
@@ -207,4 +206,4 @@ function start() {
 /**
  * Start Application
  */
-start();
+start();