Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-26 17:55:24 +03:00
Code Issues Wiki Activity

Don't save link if nothing selected

Browse source 
Initially hide logic list in range template
Add show/hide for logic list
This commit is contained in:
Dave Huber 2019-02-08 00:06:18 -06:00
parent 5b8e38c216
commit 75351722ad
2 changed files with 42 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/css/tabs/auxiliary.css
View file

@ -143,11 +143,13 @@
float: left;
min-width: 90px;
text-align: center;
margin-top: -4px;
}
.tab-auxiliary .range .channel {
border: 1px solid silver;
border-radius: 3px;
margin-bottom: 3px;
}
.tab-auxiliary .range .logic {

32
src/js/tabs/auxiliary.js
View file

@ -99,6 +99,8 @@ TABS.auxiliary.initialize = function (callback) {
logicList.append(logicOption);
}
logicOptionTemplate.val(0);
logicList.hide();
}
function configureLinkTemplate() {
@ -139,14 +141,17 @@ TABS.auxiliary.initialize = function (callback) {
var rangeIndex = $(modeElement).find('.range').length;
if (rangeIndex == 0) {
$(modeElement).find('.addLink').hide();
}
var rangeElement = $('#tab-auxiliary-templates .range').clone();
rangeElement.attr('id', 'mode-' + modeIndex + '-range-' + rangeIndex);
modeElement.find('.ranges').append(rangeElement);
if (rangeIndex == 0) {
$(modeElement).find('.addLink').hide();
} else {
var prevRangeElement = $(modeElement).find('.ranges').children().eq(rangeIndex - 1);
$(prevRangeElement).find('.logic').show();
}
$(rangeElement).find('.channel-slider').noUiSlider({
start: rangeValues,
behaviour: 'snap-drag',
@ -183,6 +188,9 @@ TABS.auxiliary.initialize = function (callback) {
if (modeId != 0){ // don't show Link for ARM
$(modeElement).find('.addLink').show();
}
} else {
var lastRangeElement = $(modeElement).find('.ranges').children().eq(numSiblings - 1);
$(lastRangeElement).find('.logic').hide();
}
rangeElement.remove();
@ -250,7 +258,7 @@ TABS.auxiliary.initialize = function (callback) {
modeLogic: 0,
linkedTo: 0
};
if (semver.gte(apiVersion, "1.41.0")) {
if (semver.gte(CONFIG.apiVersion, "1.41.0")) {
modeRangeExtra = MODE_RANGES_EXTRA[modeRangeIndex];
}
@ -322,6 +330,17 @@ TABS.auxiliary.initialize = function (callback) {
});
$(modeElement).find('.link').each(function() {
var linkedToSelection = parseInt($(this).find('.linkedTo').val());
if (linkedToSelection == 0) {
$(modeElement).find('.addRange').show();
if (modeId != 0){ // don't show Link for ARM
$(modeElement).find('.addLink').show();
}
$(this).remove();
} else {
var modeRange = {
id: modeId,
auxChannelIndex: 0,
@ -335,9 +354,10 @@ TABS.auxiliary.initialize = function (callback) {
var modeRangeExtra = {
id: modeId,
modeLogic: 0,
linkedTo: parseInt($(this).find('.linkedTo').val())
linkedTo: linkedToSelection
};
MODE_RANGES_EXTRA.push(modeRangeExtra);
}
});
});