mirror of
https://github.com/betaflight/betaflight-configurator.git
synced 2025-07-21 15:25:22 +03:00
Change lexical scope adjustments
This commit is contained in:
Mark Haslinghuis
parent
317f937fd5
commit
79f9cd52bb
1 changed files with 43 additions and 43 deletions
|
|
@ -3,7 +3,7 @@
|
|||
TABS.adjustments = {};
|
||||
|
||||
TABS.adjustments.initialize = function (callback) {
|
||||
var self = this;
|
||||
const self = this;
|
||||
GUI.active_tab_ref = this;
|
||||
GUI.active_tab = 'adjustments';
|
||||
|
||||
|
|
@ -12,10 +12,10 @@ TABS.adjustments.initialize = function (callback) {
|
|||
}
|
||||
|
||||
function get_box_ids() {
|
||||
MSP.send_message(MSPCodes.MSP_BOXIDS, false, false, get_rc_data);
|
||||
MSP.send_message(MSPCodes.MSP_BOXIDS, false, false, getRcData);
|
||||
}
|
||||
|
||||
function get_rc_data() {
|
||||
function getRcData() {
|
||||
MSP.send_message(MSPCodes.MSP_RC, false, false, load_html);
|
||||
}
|
||||
|
||||
|
|
@ -27,8 +27,8 @@ TABS.adjustments.initialize = function (callback) {
|
|||
|
||||
function addAdjustment(adjustmentIndex, adjustmentRange, auxChannelCount) {
|
||||
|
||||
var template = $('#tab-adjustments-templates .adjustments .adjustment');
|
||||
var newAdjustment = template.clone();
|
||||
const template = $('#tab-adjustments-templates .adjustments .adjustment');
|
||||
const newAdjustment = template.clone();
|
||||
|
||||
$(newAdjustment).attr('id', 'adjustment-' + adjustmentIndex);
|
||||
$(newAdjustment).data('index', adjustmentIndex);
|
||||
|
|
@ -38,7 +38,7 @@ TABS.adjustments.initialize = function (callback) {
|
|||
//
|
||||
|
||||
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
|
||||
var adjustmentList = $(newAdjustment).find('.adjustmentSlot .slot');
|
||||
const adjustmentList = $(newAdjustment).find('.adjustmentSlot .slot');
|
||||
adjustmentList.val(adjustmentRange.slotIndex);
|
||||
}
|
||||
|
||||
|
|
@ -46,11 +46,11 @@ TABS.adjustments.initialize = function (callback) {
|
|||
// populate source channel select box
|
||||
//
|
||||
|
||||
var channelList = $(newAdjustment).find('.channelInfo .channel');
|
||||
var channelOptionTemplate = $(channelList).find('option');
|
||||
const channelList = $(newAdjustment).find('.channelInfo .channel');
|
||||
const channelOptionTemplate = $(channelList).find('option');
|
||||
channelOptionTemplate.remove();
|
||||
for (var channelIndex = 0; channelIndex < auxChannelCount; channelIndex++) {
|
||||
var channelOption = channelOptionTemplate.clone();
|
||||
for (let channelIndex = 0; channelIndex < auxChannelCount; channelIndex++) {
|
||||
const channelOption = channelOptionTemplate.clone();
|
||||
channelOption.text('AUX ' + (channelIndex + 1));
|
||||
channelOption.val(channelIndex);
|
||||
channelList.append(channelOption);
|
||||
|
|
@ -61,7 +61,7 @@ TABS.adjustments.initialize = function (callback) {
|
|||
// update selected function
|
||||
//
|
||||
|
||||
var functionList = $(newAdjustment).find('.functionSelection .function');
|
||||
const functionList = $(newAdjustment).find('.functionSelection .function');
|
||||
// update list of selected functions
|
||||
|
||||
functionList.val(adjustmentRange.adjustmentFunction);
|
||||
|
|
@ -70,11 +70,11 @@ TABS.adjustments.initialize = function (callback) {
|
|||
// populate function channel select box
|
||||
//
|
||||
|
||||
var switchList = $(newAdjustment).find('.functionSwitchChannel .channel');
|
||||
var switchOptionTemplate = $(switchList).find('option');
|
||||
const switchList = $(newAdjustment).find('.functionSwitchChannel .channel');
|
||||
const switchOptionTemplate = $(switchList).find('option');
|
||||
switchOptionTemplate.remove();
|
||||
var switchOption;
|
||||
for (var switchIndex = 0; switchIndex < auxChannelCount; switchIndex++) {
|
||||
let switchOption;
|
||||
for (let switchIndex = 0; switchIndex < auxChannelCount; switchIndex++) {
|
||||
switchOption = switchOptionTemplate.clone();
|
||||
switchOption.text('AUX ' + (switchIndex + 1));
|
||||
switchOption.val(switchIndex);
|
||||
|
|
@ -86,17 +86,17 @@ TABS.adjustments.initialize = function (callback) {
|
|||
// configure range
|
||||
//
|
||||
|
||||
var channel_range = {
|
||||
const channel_range = {
|
||||
'min': [ 900 ],
|
||||
'max': [ 2100 ]
|
||||
};
|
||||
|
||||
var rangeValues = [1300, 1700];
|
||||
let rangeValues = [1300, 1700];
|
||||
if (adjustmentRange.range != undefined) {
|
||||
rangeValues = [adjustmentRange.range.start, adjustmentRange.range.end];
|
||||
}
|
||||
|
||||
var rangeElement = $(newAdjustment).find('.range');
|
||||
let rangeElement = $(newAdjustment).find('.range');
|
||||
|
||||
$(rangeElement).find('.channel-slider').noUiSlider({
|
||||
start: rangeValues,
|
||||
|
|
@ -124,17 +124,17 @@ TABS.adjustments.initialize = function (callback) {
|
|||
// add the enable/disable behavior
|
||||
//
|
||||
|
||||
var enableElement = $(newAdjustment).find('.enable');
|
||||
const enableElement = $(newAdjustment).find('.enable');
|
||||
$(enableElement).data('adjustmentElement', newAdjustment);
|
||||
$(enableElement).change(function() {
|
||||
var adjustmentElement = $(this).data('adjustmentElement');
|
||||
const adjustmentElement = $(this).data('adjustmentElement');
|
||||
if ($(this).prop("checked")) {
|
||||
$(adjustmentElement).find(':input').prop("disabled", false);
|
||||
$(adjustmentElement).find('.channel-slider').removeAttr("disabled");
|
||||
var rangeElement = $(adjustmentElement).find('.range .channel-slider');
|
||||
var range = $(rangeElement).val();
|
||||
rangeElement = $(adjustmentElement).find('.range .channel-slider');
|
||||
const range = $(rangeElement).val();
|
||||
if (range[0] == range[1]) {
|
||||
var defaultRangeValues = [1300, 1700];
|
||||
const defaultRangeValues = [1300, 1700];
|
||||
$(rangeElement).val(defaultRangeValues);
|
||||
}
|
||||
} else {
|
||||
|
|
@ -146,7 +146,7 @@ TABS.adjustments.initialize = function (callback) {
|
|||
$(this).prop("disabled", false);
|
||||
});
|
||||
|
||||
var isEnabled = (adjustmentRange.range.start != adjustmentRange.range.end);
|
||||
const isEnabled = (adjustmentRange?.range?.start !== adjustmentRange?.range?.end);
|
||||
$(enableElement).prop("checked", isEnabled).change();
|
||||
|
||||
return newAdjustment;
|
||||
|
|
@ -156,11 +156,11 @@ TABS.adjustments.initialize = function (callback) {
|
|||
|
||||
self.adjust_template();
|
||||
|
||||
var auxChannelCount = FC.RC.active_channels - 4;
|
||||
let auxChannelCount = FC.RC.active_channels - 4;
|
||||
|
||||
var modeTableBodyElement = $('.tab-adjustments .adjustments tbody');
|
||||
for (var adjustmentIndex = 0; adjustmentIndex < FC.ADJUSTMENT_RANGES.length; adjustmentIndex++) {
|
||||
var newAdjustment = addAdjustment(adjustmentIndex, FC.ADJUSTMENT_RANGES[adjustmentIndex], auxChannelCount);
|
||||
const modeTableBodyElement = $('.tab-adjustments .adjustments tbody');
|
||||
for (let adjustmentIndex = 0; adjustmentIndex < FC.ADJUSTMENT_RANGES.length; adjustmentIndex++) {
|
||||
const newAdjustment = addAdjustment(adjustmentIndex, FC.ADJUSTMENT_RANGES[adjustmentIndex], auxChannelCount);
|
||||
modeTableBodyElement.append(newAdjustment);
|
||||
}
|
||||
|
||||
|
|
@ -178,11 +178,11 @@ TABS.adjustments.initialize = function (callback) {
|
|||
$('a.save').click(function () {
|
||||
|
||||
// update internal data structures based on current UI elements
|
||||
var requiredAdjustmentRangeCount = FC.ADJUSTMENT_RANGES.length;
|
||||
const requiredAdjustmentRangeCount = FC.ADJUSTMENT_RANGES.length;
|
||||
|
||||
FC.ADJUSTMENT_RANGES = [];
|
||||
|
||||
var defaultAdjustmentRange = {
|
||||
const defaultAdjustmentRange = {
|
||||
slotIndex: 0,
|
||||
auxChannelIndex: 0,
|
||||
range: {
|
||||
|
|
@ -194,16 +194,16 @@ TABS.adjustments.initialize = function (callback) {
|
|||
};
|
||||
|
||||
$('.tab-adjustments .adjustments .adjustment').each(function () {
|
||||
var adjustmentElement = $(this);
|
||||
const adjustmentElement = $(this);
|
||||
|
||||
if ($(adjustmentElement).find('.enable').prop("checked")) {
|
||||
var rangeValues = $(this).find('.range .channel-slider').val();
|
||||
var slotIndex = 0;
|
||||
const rangeValues = $(this).find('.range .channel-slider').val();
|
||||
let slotIndex = 0;
|
||||
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
|
||||
slotIndex = parseInt($(this).find('.adjustmentSlot .slot').val());
|
||||
}
|
||||
|
||||
var adjustmentRange = {
|
||||
const adjustmentRange = {
|
||||
slotIndex: slotIndex,
|
||||
auxChannelIndex: parseInt($(this).find('.channelInfo .channel').val()),
|
||||
range: {
|
||||
|
|
@ -219,7 +219,7 @@ TABS.adjustments.initialize = function (callback) {
|
|||
}
|
||||
});
|
||||
|
||||
for (var adjustmentRangeIndex = FC.ADJUSTMENT_RANGES.length; adjustmentRangeIndex < requiredAdjustmentRangeCount; adjustmentRangeIndex++) {
|
||||
for (let adjustmentRangeIndex = FC.ADJUSTMENT_RANGES.length; adjustmentRangeIndex < requiredAdjustmentRangeCount; adjustmentRangeIndex++) {
|
||||
FC.ADJUSTMENT_RANGES.push(defaultAdjustmentRange);
|
||||
}
|
||||
|
||||
|
|
@ -242,10 +242,10 @@ TABS.adjustments.initialize = function (callback) {
|
|||
} else if (channelPosition > 2100) {
|
||||
channelPosition = 2100;
|
||||
}
|
||||
var percentage = (channelPosition - 900) / (2100-900) * 100;
|
||||
const percentage = (channelPosition - 900) / (2100-900) * 100;
|
||||
|
||||
$('.adjustments .adjustment').each( function () {
|
||||
var auxChannelCandidateIndex = $(this).find('.channel').val();
|
||||
const auxChannelCandidateIndex = $(this).find('.channel').val();
|
||||
if (auxChannelCandidateIndex != auxChannelIndex) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -260,9 +260,9 @@ TABS.adjustments.initialize = function (callback) {
|
|||
}
|
||||
|
||||
function update_ui() {
|
||||
var auxChannelCount = FC.RC.active_channels - 4;
|
||||
auxChannelCount = FC.RC.active_channels - 4;
|
||||
|
||||
for (var auxChannelIndex = 0; auxChannelIndex < auxChannelCount; auxChannelIndex++) {
|
||||
for (let auxChannelIndex = 0; auxChannelIndex < auxChannelCount; auxChannelIndex++) {
|
||||
update_marker(auxChannelIndex, FC.RC.channels[auxChannelIndex + 4]);
|
||||
}
|
||||
}
|
||||
|
|
@ -288,8 +288,8 @@ TABS.adjustments.cleanup = function (callback) {
|
|||
|
||||
TABS.adjustments.adjust_template = function () {
|
||||
|
||||
var selectFunction = $('#functionSelectionSelect');
|
||||
var elementsNumber;
|
||||
const selectFunction = $('#functionSelectionSelect');
|
||||
let elementsNumber;
|
||||
|
||||
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
|
||||
elementsNumber = 31; // OSD Profile Select & LED Profile Select
|
||||
|
|
@ -310,8 +310,8 @@ TABS.adjustments.adjust_template = function () {
|
|||
// For 1.40, the D Setpoint has been replaced, so we replace it with the correct values
|
||||
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
|
||||
|
||||
var element22 = selectFunction.find("option[value='22']");
|
||||
var element23 = selectFunction.find("option[value='23']");
|
||||
const element22 = selectFunction.find("option[value='22']");
|
||||
const element23 = selectFunction.find("option[value='23']");
|
||||
|
||||
// Change the "text"
|
||||
element22.text(i18n.getMessage('adjustmentsFunction22_2'));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue