From 84ef7f23d7b918a3385c399d1a81a7e78f2fd830 Mon Sep 17 00:00:00 2001
From: tricopterY <tricoptery@gmail.com>
Date: Wed, 16 Dec 2015 07:16:25 +1100
Subject: [PATCH 1/2] Minor typo fixes and cleanup

---
 _locales/en/messages.json | 4 ++--
 tabs/adjustments.css      | 3 +--
 tabs/auxiliary.css        | 2 +-
 tabs/configuration.css    | 3 ++-
 tabs/setup.css            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 57033e3a..15c27258 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1323,13 +1323,13 @@
         "message": "Failsafe Throttle"
     },
     "failsafeFeaturesHelpNew": {
-        "message": "Failsafe has two stages. <strong>Stage 1</strong> is entered when a flightchannel has an invalid pulse length, the receiver reports failsafe mode or there is no signal from the receiver at all, the channel fallback settings are applied to <span style=\"color: red\">all channels</span> and a short amount of time is provided to allow for recovery. <strong>Stage 2</strong> is entered when the error condition takes longer then the configured guard time while the craft is <span style=\"color: red\">armed</span>, all channels will remain at the applied channel fallback setting unless overruled by the chosen procedure. <br /><strong>Note:</strong> Prior to entering stage 1, channel fallback settings are also applied to individual AUX channels that have invalid pulses."
+        "message": "Failsafe has two stages. <strong>Stage 1</strong> is entered when a flightchannel has an invalid pulse length, the receiver reports failsafe mode or there is no signal from the receiver at all, the channel fallback settings are applied to <span style=\"color: red\">all channels</span> and a short amount of time is provided to allow for recovery. <strong>Stage 2</strong> is entered when the error condition takes longer than the configured guard time while the craft is <span style=\"color: red\">armed</span>, all channels will remain at the applied channel fallback setting unless overruled by the chosen procedure. <br /><strong>Note:</strong> Prior to entering stage 1, channel fallback settings are also applied to individual AUX channels that have invalid pulses."
     },
     "failsafePulsrangeTitle": {
         "message": "Valid Pulse Range Settings"
     },
     "failsafePulsrangeHelp": {
-        "message": "Pulses shorter then minimum or longer then maximum are invalid and will trigger application of individual channel fallback settings for AUX channels or entering stage 1 for flightchannels"
+        "message": "Pulses shorter than minimum or longer than maximum are invalid and will trigger application of individual channel fallback settings for AUX channels or entering stage 1 for flightchannels"
     },
     "failsafeRxMinUsecItem": {
         "message": "Minimum length"
diff --git a/tabs/adjustments.css b/tabs/adjustments.css
index d0a4f96b..4379828e 100644
--- a/tabs/adjustments.css
+++ b/tabs/adjustments.css
@@ -67,8 +67,7 @@
 .tab-adjustments .adjustment select {
     /* outline: 1px solid silver; */
     border-radius: 3px;
-    border: 1px solid silver;
-    #
+    border: 1px solid silver;    
 }
 
 .tab-adjustments .adjustment td {
diff --git a/tabs/auxiliary.css b/tabs/auxiliary.css
index e332d926..383e354e 100644
--- a/tabs/auxiliary.css
+++ b/tabs/auxiliary.css
@@ -58,7 +58,7 @@
 }
 
 .tab-auxiliary .mode.off .info, .tab-auxiliary .mode.on .info {
-    color:;
+    
 }
 
 .tab-auxiliary .mode .info {
diff --git a/tabs/configuration.css b/tabs/configuration.css
index ad1eb302..be975331 100644
--- a/tabs/configuration.css
+++ b/tabs/configuration.css
@@ -187,7 +187,8 @@
     width: 100%;
 }
 
-.tab-configuration .spacer_box {padding-bottom 10px;
+.tab-configuration .spacer_box {
+    padding-bottom: 10px;
     float: left;
     width: calc(100% - 20px);
 }
diff --git a/tabs/setup.css b/tabs/setup.css
index c43122b5..6515827c 100644
--- a/tabs/setup.css
+++ b/tabs/setup.css
@@ -56,7 +56,7 @@
     font-weight: bold;
     border: 1px solid silver;
     background-color: #ececec;
-    border-radius: 3px:
+    border-radius: 3px;
     z-index: 100;
 }
 

From af2089e38c9b39da372659891c9a6c5ebb15b21c Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Wed, 16 Dec 2015 11:03:33 +0100
Subject: [PATCH 2/2] fix API version check when loading 3D settings on
 configuration tab.

---
 tabs/configuration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tabs/configuration.js b/tabs/configuration.js
index f76a9868..7110c954 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -55,7 +55,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
     function load_3d() {
         var next_callback = load_html;
-        if (semver.lt(CONFIG.apiVersion, "1.14.0")) {
+        if (semver.gte(CONFIG.apiVersion, "1.14.0")) {
             MSP.send_message(MSP_codes.MSP_3D, false, false, next_callback);
         } else {
             next_callback();