From 8429b51d6eafbc4b175a0c91a5f653a26e22922a Mon Sep 17 00:00:00 2001 From: Darren Lines Date: Thu, 19 May 2022 11:56:36 +0100 Subject: [PATCH 1/2] Let help icons click through to settings --- js/settings.js | 27 ++++++++++ tabs/advanced_tuning.html | 106 +++++++++++++++++++------------------- tabs/configuration.html | 28 +++++----- tabs/failsafe.html | 14 ++--- tabs/gps.html | 46 +++++------------ tabs/osd.html | 38 +++++++------- tabs/outputs.html | 14 ++--- tabs/pid_tuning.html | 68 ++++++++++++------------ 8 files changed, 175 insertions(+), 166 deletions(-) diff --git a/js/settings.js b/js/settings.js index e07ea3c8..6502ba3c 100644 --- a/js/settings.js +++ b/js/settings.js @@ -508,6 +508,8 @@ var Settings = (function () { self.processHtml = function(callback) { return function() { self.configureInputs().then(callback); + self.linkHelpIcons(); + //self.configureInputs().then(self.linkHelpIcons().then(callback)); }; }; @@ -515,5 +517,30 @@ var Settings = (function () { return $('[data-setting="' + settingName + '"]').val(); }; + self.linkHelpIcons = function() { + var helpIcons = []; + $('.helpicon').each(function(){ + helpIcons.push($(this)); + }); + + return Promise.mapSeries(helpIcons, function(helpIcon, ii) { + let forAtt = helpIcon.attr('for'); + + if (typeof forAtt !== "undefined" && forAtt !== "") { + let dataSettingName = $('#' + forAtt).data("setting"); + + if (typeof dataSettingName === "undefined" || dataSettingName === "") { + dataSettingName = $('#' + forAtt).data("setting-placeholder"); + } + + if (typeof dataSettingName !== "undefined" && dataSettingName !== "") { + helpIcon.wrap(''); + } + } + + return; + }); + }; + return self; })(); diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html index cb86bdfe..3cf9f681 100644 --- a/tabs/advanced_tuning.html +++ b/tabs/advanced_tuning.html @@ -13,74 +13,74 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -93,22 +93,22 @@
-
+
-
+
-
+
-
+
@@ -130,13 +130,13 @@
-
+
-
+
@@ -152,37 +152,37 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -193,13 +193,13 @@
-
+
-
+
@@ -225,7 +225,7 @@
-
+
@@ -234,12 +234,12 @@
-
+
-
+
@@ -252,7 +252,7 @@
-
+
@@ -268,49 +268,49 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -339,19 +339,19 @@
-
+
-
+
-
+
@@ -362,7 +362,7 @@
-
+
@@ -378,13 +378,13 @@
-
+
-
+
@@ -402,13 +402,13 @@
-
+
-
+
@@ -422,13 +422,13 @@
-
+
-
+
@@ -442,12 +442,12 @@
-
+
-
+
@@ -456,7 +456,7 @@
-
+
diff --git a/tabs/configuration.html b/tabs/configuration.html index a0ec051d..0c7691be 100644 --- a/tabs/configuration.html +++ b/tabs/configuration.html @@ -49,7 +49,7 @@ -
+
@@ -106,14 +106,14 @@
- -
+
@@ -136,11 +136,11 @@
- + -
+
@@ -163,14 +163,14 @@
- + -
+
- + -
+
@@ -243,15 +243,15 @@
- + -
+
- - -
+ + +
diff --git a/tabs/failsafe.html b/tabs/failsafe.html index 70fd7ce5..277ee236 100644 --- a/tabs/failsafe.html +++ b/tabs/failsafe.html @@ -7,9 +7,9 @@
- + -
+
@@ -28,9 +28,9 @@
- + -
+
@@ -51,19 +51,19 @@ -
+
-
+
-
+
diff --git a/tabs/gps.html b/tabs/gps.html index 562dc785..e809bd04 100644 --- a/tabs/gps.html +++ b/tabs/gps.html @@ -16,58 +16,40 @@
- - -
+ + +
- +
- +
- - + +
- - -
+ + +
- -
+ +
diff --git a/tabs/osd.html b/tabs/osd.html index 774aaff6..c1dffde7 100644 --- a/tabs/osd.html +++ b/tabs/osd.html @@ -58,9 +58,9 @@ -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+