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

Merge pull request #1069 from DieHertz/fix-ci-build-type-on-reset

Browse source 
Fixed CI build type silently defaulting to Release
This commit is contained in:
Andrey Mironov 2018-06-20 14:37:46 +03:00 • committed by GitHub
commit 4c6c67a7ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/js/tabs/firmware_flasher.js
View file

@ -269,11 +269,6 @@ TABS.firmware_flasher.initialize = function (callback) {
// translate to user-selected language
i18n.localizePage();
chrome.storage.local.get('selected_build_type', function (result) {
// ensure default build type is selected
buildType_e.val(result.selected_build_type || 0).trigger('change');
});
buildType_e.change(function() {
$("a.load_remote_file").addClass('disabled');
var build_type = $(this).val();
@ -514,6 +509,11 @@ TABS.firmware_flasher.initialize = function (callback) {
});
});
chrome.storage.local.get('selected_build_type', function (result) {
// ensure default build type is selected
buildType_e.val(result.selected_build_type || 0).trigger('change');
});
chrome.storage.local.get('no_reboot_sequence', function (result) {
if (result.no_reboot_sequence) {
$('input.updating').prop('checked', true);
@ -611,15 +611,9 @@ TABS.firmware_flasher.initialize = function (callback) {
});
chrome.storage.local.get('show_development_releases', function (result) {
if (result.show_development_releases) {
$('input.show_development_releases').prop('checked', true);
} else {
$('input.show_development_releases').prop('checked', false);
}
self.releaseChecker.loadReleaseData(buildBoardOptions);
$('input.show_development_releases').change(function () {
$('input.show_development_releases')
.prop('checked', result.show_development_releases)
.change(function () {
chrome.storage.local.set({'show_development_releases': $(this).is(':checked')});
}).change();
});