sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Commit selection should not be available unless prerelease (#3144) 

FIX: Commit selection should not be available unless the release is an "Unstable" / "zulu" release.
10.9-maintenance
J Blackman 2022-12-15 11:11:50 +11:00 committed by GitHub
parent f861ffa7dd
commit 1c94746cb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/js/tabs/firmware_flasher.js
View File

@ -277,18 +277,24 @@ firmware_flasher.initialize = function (callback) {
$('div.build_configuration').slideDown();
const expertMode = $('.tab-firmware_flasher input.expert_mode').is(':checked');
if (!expertMode) {
$('div.commitSelection').hide();
} else {
$('div.commitSelection').show();
if (expertMode) {
$('div.expertOptions').show();
self.releaseLoader.loadCommits(summary.release, (commits) => {
const select_e = $('select[name="commits"]');
select_e.empty();
commits.forEach((commit) => {
select_e.append($(`<option value='${commit.sha}'>${commit.message}</option>`));
if (summary.releaseType === 'Unstable') {
self.releaseLoader.loadCommits(summary.release, (commits) => {
const select_e = $('select[name="commits"]');
select_e.empty();
commits.forEach((commit) => {
select_e.append($(`<option value='${commit.sha}'>${commit.message}</option>`));
});
});
});
$('div.commitSelection').show();
} else {
$('div.commitSelection').hide();
}
} else {
$('div.expertOptions').hide();
}
}

16
src/tabs/firmware_flasher.html
View File

@ -197,9 +197,16 @@
</div>
</div>
</div>
<div class="commitSelection spacer" style="margin-bottom: 10px;">
<div class="expertOptions spacer hide-in-classic-build-mode" style="margin-bottom: 10px;">
<div class="margin-bottom">
<div style="width: 49%; float: left;">
<strong i18n="firmwareFlasherBuildCustomDefines"></strong>
<div id="customDefinesInfo" class="build-options-wrapper">
<input id="customDefines" name="customDefines"></input>
<div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherCustomDefinesDescription"></div>
</div>
</div>
<div class="commitSelection" style="width: 49%; float: right;">
<strong i18n="firmwareFlasherBranch"></strong>
<div id="branchInfo" class="build-options-wrapper">
<select id="commits" name="commits" class="select2">
@ -207,13 +214,6 @@
<div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherBranchDescription"></div>
</div>
</div>
<div style="width: 49%; float: right;" class="hide-in-classic-build-mode">
<strong i18n="firmwareFlasherBuildCustomDefines"></strong>
<div id="customDefinesInfo" class="build-options-wrapper">
<input id="customDefines" name="customDefines"></input>
<div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherCustomDefinesDescription"></div>
</div>
</div>
</div>
</div>
</div>