Merge branch 'master' into MrD_Set-OSD-elements-precision

iNavFlight · Oct 25, 2024 · 0898292 · 0898292
2 parents 9d37416 + 4150613
commit 0898292
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/tabs/osd.html b/tabs/osd.html
@@ -409,39 +409,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>
@@ -491,4 +491,4 @@ <h1 class="tab_title">Font:</h1>
             <a class="fonts" id="fontmanager" href="#" data-i18n="osd_font_manager"></a>
         </div>
     </div>
-</div>
+</div>
diff --git a/tabs/osd.js b/tabs/osd.js
@@ -3560,6 +3560,7 @@ function createCustomElements(){
     }
 
     var customElementsContainer = $('#osdCustomElements');
+    var init = true;
 
     for(var i = 0; i < FC.OSD_CUSTOM_ELEMENTS.settings.customElementsCount; i++){
         var label = $('<label>');
@@ -3617,7 +3618,9 @@ function createCustomElements(){
                 var valueBlock = $('.' + $(this).data('valueCellClass'))
                 valueBlock.find('.value').hide();
                 valueBlock.find('.' + dataValue).show();
-                updateOSDCustomElementsDisplay();
+                if(!init){
+                    updateOSDCustomElementsDisplay();
+                }
             });
         }
 
@@ -3647,6 +3650,7 @@ function createCustomElements(){
 
     fillCustomElementsValues();
     customElementsInitCallback();
+    init = false;
 }
 
 function updateOSDCustomElementsDisplay() {
@@ -4090,4 +4094,4 @@ TABS.osd.cleanup = function (callback) {
     $('.jBox-wrapper').remove();
 
     if (callback) callback();
-};
+};