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

Move unknown OSD elements to the end of the list

10.7.0-preview
Miguel Angel Mulero Martinez 2019-06-12 15:08:34 +02:00
parent 095c98e838
commit c9793132ef
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/js/tabs/osd.js
View File

@ -1065,7 +1065,7 @@ OSD.constants = {
},
},
UNKNOWN_DISPLAY_FIELD: {
name: 'UNKNOWN_',
name: 'UNKNOWN',
text: 'osdTextElementUnknown',
desc: 'osdDescElementUnknown',
default_position: -1,
@ -1813,7 +1813,7 @@ OSD.msp = {
ignoreSize = true;
}
d.display_items.push($.extend({
name: suffix ? c.name + suffix : c.name,
name: c.name,
text: suffix ? [c.text, suffix] : c.text,
desc: c.desc,
index: j,
@ -2354,17 +2354,21 @@ TABS.osd.initialize = function (callback) {
);
}
// Insert in alphabetical order
let added = false;
$displayFields.children().each(function() {
if ($(this).text().localeCompare($field.text(), i18n.getCurrentLocale(), { sensitivity: 'base' }) > 0) {
$(this).before($field);
added = true;
return false;
}
});
if(!added) {
// Insert in alphabetical order, with unknown fields at the end
if (field.name == OSD.constants.UNKNOWN_DISPLAY_FIELD.name) {
$displayFields.append($field);
} else {
let added = false;
$displayFields.children().each(function() {
if ($(this).text().localeCompare($field.text(), i18n.getCurrentLocale(), { sensitivity: 'base' }) > 0) {
$(this).before($field);
added = true;
return false;
}
});
if(!added) {
$displayFields.append($field);
}
}
}