Skip to content

Commit

Permalink
Merge branch 'iNavFlight:master' into Define-Allowed-MSP-Power-Levels
Browse files Browse the repository at this point in the history
  • Loading branch information
geoffsim authored Oct 17, 2024
2 parents 01c1666 + 4150613 commit a76a94c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
16 changes: 8 additions & 8 deletions tabs/osd.html
Original file line number Diff line number Diff line change
Expand Up @@ -391,39 +391,39 @@ <h1 class="tab_title" data-i18n="tabOSD"></h1>
</label>
<div for="osd_hud_wp_disp" class="helpicon cf_tip" data-i18n_title="osd_hud_wp_disp_help"></div>
<label>
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_hud_wp_disp" class="toggle update_preview" data-live="true">
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_hud_wp_disp" class="update_preview" data-live="true">
<span data-i18n="osd_hud_wp_disp"></span>
</label>
<div for="osd_hud_radar_disp" class="helpicon cf_tip" data-i18n_title="osd_hud_radar_disp_help"></div>
<label>
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_hud_radar_disp" class="toggle update_preview" data-live="true">
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_hud_radar_disp" class="update_preview" data-live="true">
<span data-i18n="osd_hud_radar_disp"></span>
</label>

<div for="osd_hud_radar_range_min" class="helpicon cf_tip" data-i18n_title="osd_hud_radar_range_min_help"></div>
<label>
<input type="number" data-step="1" data-unit="m" data-setting-multiplier="1" data-setting="osd_hud_radar_range_min" class="toggle update_preview" data-live="true">
<input type="number" data-step="1" data-unit="m" data-setting-multiplier="1" data-setting="osd_hud_radar_range_min" class="update_preview" data-live="true">
<span data-i18n="osd_hud_radar_range_min"></span>
</label>
<div for="osd_hud_radar_range_max" class="helpicon cf_tip" data-i18n_title="osd_hud_radar_range_max_help"></div>
<label>
<input type="number" data-step="1" data-unit="m" data-setting-multiplier="1" data-setting="osd_hud_radar_range_max" class="toggle update_preview" data-live="true">
<input type="number" data-step="1" data-unit="m" data-setting-multiplier="1" data-setting="osd_hud_radar_range_max" class="update_preview" data-live="true">
<span data-i18n="osd_hud_radar_range_max"></span>
</label>

<div for="osd_camera_fov_h" class="helpicon cf_tip" data-i18n_title="osd_camera_fov_h_help"></div>
<label>
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_camera_fov_h" class="toggle update_preview" data-live="true">
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_camera_fov_h" class="update_preview" data-live="true">
<span data-i18n="osd_camera_fov_h"></span>
</label>
<div for="osd_camera_fov_v" class="helpicon cf_tip" data-i18n_title="osd_camera_fov_v_help"></div>
<label>
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_camera_fov_v" class="toggle update_preview" data-live="true">
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_camera_fov_v" class="update_preview" data-live="true">
<span data-i18n="osd_camera_fov_v"></span>
</label>
<div for="osd_camera_uptilt" class="helpicon cf_tip" data-i18n_title="osd_camera_uptilt_help"></div>
<label>
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_camera_uptilt" class="toggle update_preview" data-live="true">
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_camera_uptilt" class="update_preview" data-live="true">
<span data-i18n="osd_camera_uptilt"></span>
</label>
</div>
Expand Down Expand Up @@ -473,4 +473,4 @@ <h1 class="tab_title">Font:</h1>
<a class="fonts" id="fontmanager" href="#" data-i18n="osd_font_manager"></a>
</div>
</div>
</div>
</div>
8 changes: 6 additions & 2 deletions tabs/osd.js
Original file line number Diff line number Diff line change
Expand Up @@ -3549,6 +3549,7 @@ function createCustomElements(){
}

var customElementsContainer = $('#osdCustomElements');
var init = true;

for(var i = 0; i < FC.OSD_CUSTOM_ELEMENTS.settings.customElementsCount; i++){
var label = $('<label>');
Expand Down Expand Up @@ -3606,7 +3607,9 @@ function createCustomElements(){
var valueBlock = $('.' + $(this).data('valueCellClass'))
valueBlock.find('.value').hide();
valueBlock.find('.' + dataValue).show();
updateOSDCustomElementsDisplay();
if(!init){
updateOSDCustomElementsDisplay();
}
});
}

Expand Down Expand Up @@ -3636,6 +3639,7 @@ function createCustomElements(){

fillCustomElementsValues();
customElementsInitCallback();
init = false;
}

function updateOSDCustomElementsDisplay() {
Expand Down Expand Up @@ -4079,4 +4083,4 @@ TABS.osd.cleanup = function (callback) {
$('.jBox-wrapper').remove();

if (callback) callback();
};
};

0 comments on commit a76a94c

Please sign in to comment.