From 53a615279d05d90f3f6d0badb9feb3ff5406425f Mon Sep 17 00:00:00 2001
From: skaman82 <albert@wd-design.de>
Date: Mon, 2 Nov 2015 13:37:46 +0100
Subject: [PATCH] fixing auto connect

---
 js/serial_backend.js | 24 ++++++++++++------------
 main.css             |  7 ++++++-
 main.html            |  9 ++++++---
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/js/serial_backend.js b/js/serial_backend.js
index ce8f1adf..3bdbac3f 100755
--- a/js/serial_backend.js
+++ b/js/serial_backend.js
@@ -25,7 +25,7 @@ $(document).ready(function () {
         GUI.updateManualPortVisibility();
     });
 
-    $('a.connect').click(function () {
+    $('div.connect_controls a.connect').click(function () {
         if (GUI.connect_lock != true) { // GUI control overrides the user control
 
             var clicks = $(this).data('clicks');
@@ -41,7 +41,7 @@ $(document).ready(function () {
 
                     // lock port select & baud while we are connecting / connected
                     $('div#port-picker #port, div#port-picker #baud, div#port-picker #delay').prop('disabled', true);
-                    $('a.connect_state').text(chrome.i18n.getMessage('connecting'));
+                    $('div.connect_controls a.connect_state').text(chrome.i18n.getMessage('connecting'));
 
 
                     serial.connect(selected_port, {bitrate: selected_baud}, onOpen);
@@ -70,8 +70,8 @@ $(document).ready(function () {
                     if (!GUI.auto_connect) $('div#port-picker #baud').prop('disabled', false);
 
                     // reset connect / disconnect button
-        			$('a.connect').removeClass('active');
-					$('a.connect_state').text(chrome.i18n.getMessage('connect'));
+        			$('div.connect_controls a.connect').removeClass('active');
+					$('div.connect_controls a.connect_state').text(chrome.i18n.getMessage('connect'));
                    
                     // reset active sensor indicators
                     sensor_status(0);
@@ -186,7 +186,7 @@ function onOpen(openInfo) {
             if (!CONFIGURATOR.connectionValid) {
                 GUI.log(chrome.i18n.getMessage('noConfigurationReceived'));
 
-                $('a.connect').click(); // disconnect
+                $('div.connect_controls ').click(); // disconnect
             }
         }, 10000);
 
@@ -247,21 +247,21 @@ function onOpen(openInfo) {
         console.log('Failed to open serial port');
         GUI.log(chrome.i18n.getMessage('serialPortOpenFail'));
 
-        $('a.connect_state').text(chrome.i18n.getMessage('connect'));
-        $('a.connect').removeClass('active');
+        $('div#connectbutton a.connect_state').text(chrome.i18n.getMessage('connect'));
+        $('div#connectbutton a.connect').removeClass('active');
 
         // unlock port select & baud
         $('div#port-picker #port, div#port-picker #baud, div#port-picker #delay').prop('disabled', false);
 
         // reset data
-        $('a.connect').data("clicks", false);
+        $('div#connectbutton a.connect').data("clicks", false);
     }
 }
 
 function onConnect() {
     GUI.timeout_remove('connecting'); // kill connecting timer
-    $('a.connect_state').text(chrome.i18n.getMessage('disconnect')).addClass('active');
-    $('a.connect').addClass('active');
+    $('div#connectbutton a.connect_state').text(chrome.i18n.getMessage('disconnect')).addClass('active');
+    $('div#connectbutton a.connect').addClass('active');
     $('#tabs ul.mode-disconnected').hide();
     $('#tabs ul.mode-connected').show();
 
@@ -278,7 +278,7 @@ function onConnect() {
         var sensor_state = $('#sensor-status');
         sensor_state.show(); 
        	
-        var port_picker = $('#port-picker');
+        var port_picker = $('#portsinput');
         port_picker.hide(); 
     }
 }
@@ -293,7 +293,7 @@ function onClosed(result) {
     $('#tabs ul.mode-connected').hide();
     $('#tabs ul.mode-disconnected').show();
 
-    var port_picker = $('#port-picker');
+    var port_picker = $('#portsinput');
     port_picker.show(); 
 
     /* */
diff --git a/main.css b/main.css
index 7741a600..252901bc 100644
--- a/main.css
+++ b/main.css
@@ -134,6 +134,11 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 #port-picker {
+	position:relative;
+	width:100%;
+}
+
+#portsinput {
 	float: right;
 	margin-top: 20px;
  	margin-right:20px;
@@ -1465,7 +1470,7 @@ dialog {
 
 
 body {
-    font-size: 11px;
+    font-size: 12px;
 	}
 
 .tab-setup, .tab-landing, .tab-adjustments, .tab-auxiliary, .tab-cli, .tab-configuration, .tab-dataflash, .tab-firmware_flasher, .tab-gps, .tab-help, .tab-led-strip, .tab-logging, .tab-modes, .tab-motors, .tab-pid_tuning, .tab-ports, .tab-receiver, .tab-sensors, .tab-servos {
diff --git a/main.html b/main.html
index 1aaaf347..9257eaf4 100755
--- a/main.html
+++ b/main.html
@@ -82,14 +82,16 @@
 	<div class="headerbar">
       <div id="logo"></div>
       <a id="options" href="#" i18n_title="options_title"></a>
-      <div class="connect_controls">
+          <div id="port-picker">
+      <div class="connect_controls" id="connectbutton">
             <div class="connect_b">
               <a class="connect" href="#"></a>
             </div>
             <a class="connect_state" i18n="connect"></a>
       </div>      
-      <div id="port-picker">
-        <div class="dropdown dropdown-dark" style="margin-bottom:3px;">
+    <div id="portsinput">
+
+ <div class="dropdown dropdown-dark" style="margin-bottom:3px;">
           <select class="dropdown-select" id="port" title="Port">
             <option value="manual">Manual</option>
             <!-- port list gets generated here -->
@@ -116,6 +118,7 @@
           <label><input class="auto_connect" type="checkbox" id="togglesmall" /><span class="auto_connect" i18n="autoConnect"></span></label>
         </div>
       </div>
+   </div>
       <div class="header-wrapper">
         <div id="sensor-status" class="sensor_state mode-connected">
           <ul>