diff --git a/src/js/tabs/power.js b/src/js/tabs/power.js index 2de5ad31..bd2b9d36 100644 --- a/src/js/tabs/power.js +++ b/src/js/tabs/power.js @@ -172,7 +172,7 @@ power.initialize = function (callback) { $("#calibrationmanagercontent").hide(); $("#calibrationmanagerconfirmcontent").hide(); - // battery + // battery const templateBatteryState = $('#tab-power-templates .battery-state .battery-state'); const destinationBatteryState = $('.tab-power .battery-state'); const elementBatteryState = templateBatteryState.clone(); @@ -199,6 +199,7 @@ power.initialize = function (callback) { const haveFc = FC.CONFIG.boardType === 0 || FC.CONFIG.boardType === 2; + // fill voltage const batteryMeterTypes = [ i18n.getMessage('powerBatteryVoltageMeterTypeNone'), i18n.getMessage('powerBatteryVoltageMeterTypeAdc'), @@ -208,11 +209,11 @@ power.initialize = function (callback) { batteryMeterTypes.push(i18n.getMessage('powerBatteryVoltageMeterTypeEsc')); } - let batteryMeterType_e = $('select.batterymetersource'); - + let batteryMeterType_e = $('#batterymetersourceSelect'); for (let i = 0; i < batteryMeterTypes.length; i++) { - batteryMeterType_e.append(``); + batteryMeterType_e.append(new Option(batteryMeterTypes[i], i)); } + batteryMeterType_e.sortSelect(batteryMeterTypes[0]); // fill current const currentMeterTypes = [ @@ -226,11 +227,11 @@ power.initialize = function (callback) { currentMeterTypes.push(i18n.getMessage('powerBatteryCurrentMeterTypeMsp')); } - let currentMeterType_e = $('select.currentmetersource'); - + let currentMeterType_e = $('#currentmetersourceSelect'); for (let i = 0; i < currentMeterTypes.length; i++) { - currentMeterType_e.append(``); + currentMeterType_e.append(new Option(currentMeterTypes[i], i)); } + currentMeterType_e.sortSelect(currentMeterTypes[0]); updateDisplay(FC.VOLTAGE_METER_CONFIGS, FC.CURRENT_METER_CONFIGS); @@ -462,10 +463,11 @@ power.initialize = function (callback) { } function process_html() { - initDisplay(); // translate to user-selected language i18n.localizePage(); + initDisplay(); + GUI.content_ready(callback); } }; diff --git a/src/tabs/power.html b/src/tabs/power.html index d07168f9..2786b9b6 100644 --- a/src/tabs/power.html +++ b/src/tabs/power.html @@ -139,13 +139,13 @@