speedybac
/
inav-configurator
mirror of https://github.com/iNavFlight/inav-configurator
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1479 from iNavFlight/MrD-Tidy-firmware-flasher-targets-select-and-search

Browse Source 
Updated firmware flasher search
pull/1481/head
Paweł Spychalski 3 years ago committed by GitHub
parent 535df44569 c872b3dfcc
commit d81af0def2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File

9
tabs/firmware_flasher.js
Unescape Escape View File

@ -44,6 +44,7 @@ TABS.firmware_flasher.initialize = function (callback) {
} }
return { return {
raw_target: match[2],
target: match[2].replace("_", " "), target: match[2].replace("_", " "),
format: match[3], format: match[3],
}; };
@ -60,7 +61,7 @@ TABS.firmware_flasher.initialize = function (callback) {
var target = $(this); var target = $(this);
//alert("Comparing " + searchText + " with " + target.text()); //alert("Comparing " + searchText + " with " + target.text());
if (searchText.length > 0 && i !== 0) { if (searchText.length > 0 && i !== 0) {
if (target.text().toLowerCase().includes(searchText)) { if (target.text().toLowerCase().includes(searchText) || target.val().toLowerCase().includes(searchText)) {
target.show(); target.show();
} else { } else {
target.hide(); target.hide();
@ -130,6 +131,7 @@ TABS.firmware_flasher.initialize = function (callback) {
"version" : release.tag_name, "version" : release.tag_name,
"url" : asset.browser_download_url, "url" : asset.browser_download_url,
"file" : asset.name, "file" : asset.name,
"raw_target": result.raw_target,
"target" : result.target, "target" : result.target,
"date" : formattedDate, "date" : formattedDate,
"notes" : release.body, "notes" : release.body,
@ -147,7 +149,8 @@ TABS.firmware_flasher.initialize = function (callback) {
if($.inArray(target, selectTargets) == -1) { if($.inArray(target, selectTargets) == -1) {
selectTargets.push(target); selectTargets.push(target);
var select_e = var select_e =
$("<option value='{0}'>{0}</option>".format( $("<option value='{0}'>{1}</option>".format(
descriptor.raw_target,
descriptor.target descriptor.target
)).data('summary', descriptor); )).data('summary', descriptor);
boards_e.append(select_e); boards_e.append(select_e);
@ -165,7 +168,7 @@ TABS.firmware_flasher.initialize = function (callback) {
$('select[name="board"]').change(function() { $('select[name="board"]').change(function() {
$("a.load_remote_file").addClass('disabled'); $("a.load_remote_file").addClass('disabled');
var target = $(this).val(); var target = $(this).children("option:selected").text();
if (!GUI.connect_lock) { if (!GUI.connect_lock) {
$('.progress').val(0).removeClass('valid invalid'); $('.progress').val(0).removeClass('valid invalid');

Write Preview
Loading…
Cancel
Save