Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-25 01:05:12 +03:00
Code Wiki Activity

Fix: Input field lost focus after confirm() and alert()

Browse source
This commit is contained in:
Scavanger 2024-11-20 10:58:10 -03:00
parent 324d700afa
commit 6af70e96dd
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/gui.js
View file

@ -542,7 +542,7 @@ GUI_control.prototype.update_dataflash_global = function () {
};
/**
* Don't use alert() in Electron, it has a nasty bug: https://github.com/electron/electron/issues/31917
* Don't use alert() or confirm() in Electron, it has a nasty bug: https://github.com/electron/electron/issues/31917
*/
GUI_control.prototype.alert = function(message) {
dialog.showMessageBoxSync({ message: message, icon: "./images/inav_icon_128.png" });

2
js/sitl.js
View file

@ -156,7 +156,7 @@ var SITLProcess = {
});
} else {
alert(GUI.operating_system);
GUI.alert(GUI.operating_system);
return;
}

14
tabs/mission_control.js
View file

@ -1343,7 +1343,7 @@ TABS.mission_control.initialize = function (callback) {
function fileLoadMultiMissionCheck() {
if (singleMissionActive()) {
return true;
} else if (confirm(i18n.getMessage('confirm_overwrite_multimission_file_load_option'))) {
} else if (GUI.confirm(i18n.getMessage('confirm_overwrite_multimission_file_load_option'))) {
var options = {
filters: [ { name: "Mission file", extensions: ['mission'] } ]
};
@ -3620,7 +3620,7 @@ TABS.mission_control.initialize = function (callback) {
// Callback for Remove buttons
/////////////////////////////////////////////
$('#removeAllPoints').on('click', function () {
if (markers.length && confirm(i18n.getMessage('confirm_delete_all_points'))) {
if (markers.length && GUI.confirm(i18n.getMessage('confirm_delete_all_points'))) {
if (removeAllMultiMissionCheck()) {
removeAllWaypoints();
updateMultimissionState();
@ -3638,7 +3638,7 @@ TABS.mission_control.initialize = function (callback) {
GUI.alert(i18n.getMessage('MissionPlannerJumpTargetRemoval'));
}
else if (mission.getAttachedFromWaypoint(selectedMarker) && mission.getAttachedFromWaypoint(selectedMarker).length != 0) {
if (confirm(i18n.getMessage('confirm_delete_point_with_options'))) {
if (GUI.confirm(i18n.getMessage('confirm_delete_point_with_options'))) {
mission.getAttachedFromWaypoint(selectedMarker).forEach(function (element) {
if (element.getAction() == MWNP.WPTYPE.LAND) {
@ -3677,7 +3677,7 @@ TABS.mission_control.initialize = function (callback) {
$('#loadFileMissionButton').on('click', function () {
if (!fileLoadMultiMissionCheck()) return;
if (markers.length && !confirm(i18n.getMessage('confirm_delete_all_points'))) return;
if (markers.length && !GUI.confirm(i18n.getMessage('confirm_delete_all_points'))) return;
var options = {
filters: [ { name: "Mission file", extensions: ['mission'] } ]
};
@ -3706,7 +3706,7 @@ TABS.mission_control.initialize = function (callback) {
$('#loadMissionButton').on('click', function () {
let message = multimissionCount ? 'confirm_overwrite_multimission_file_load_option' : 'confirm_delete_all_points';
if ((markers.length || multimissionCount) && !confirm(i18n.getMessage(message))) return;
if ((markers.length || multimissionCount) && !GUI.confirm(i18n.getMessage(message))) return;
removeAllWaypoints();
$(this).addClass('disabled');
GUI.log(i18n.getMessage('startGetPoint'));
@ -3725,7 +3725,7 @@ TABS.mission_control.initialize = function (callback) {
$('#loadEepromMissionButton').on('click', function () {
let message = multimissionCount ? 'confirm_overwrite_multimission_file_load_option' : 'confirm_delete_all_points';
if ((markers.length || multimissionCount) && !confirm(i18n.getMessage(message))) return;
if ((markers.length || multimissionCount) && !GUI.confirm(i18n.getMessage(message))) return;
removeAllWaypoints();
$(this).addClass('disabled');
GUI.log(i18n.getMessage('startGetPoint'));
@ -3909,7 +3909,7 @@ TABS.mission_control.initialize = function (callback) {
}
if (missionEndFlagCount > 1) {
if (multimissionCount && !confirm(i18n.getMessage('confirm_multimission_file_load'))) {
if (multimissionCount && !GUI.confirm(i18n.getMessage('confirm_multimission_file_load'))) {
mission.flush();
return;
} else {

4
tabs/pid_tuning.js
View file

@ -299,7 +299,7 @@ TABS.pid_tuning.initialize = function (callback) {
$('.action-resetPIDs').on('click', function() {
if (confirm(i18n.getMessage('confirm_reset_pid'))) {
if (GUI.confirm(i18n.getMessage('confirm_reset_pid'))) {
MSP.send_message(MSPCodes.MSP_SET_RESET_CURR_PID, false, false, false);
GUI.updateActivatedTab();
}
@ -307,7 +307,7 @@ TABS.pid_tuning.initialize = function (callback) {
$('.action-resetDefaults').on('click', function() {
if (confirm(i18n.getMessage('confirm_select_defaults'))) {
if (GUI.confirm(i18n.getMessage('confirm_select_defaults'))) {
mspHelper.setSetting("applied_defaults", 0, function() {
mspHelper.saveToEeprom( function () {
GUI.log(i18n.getMessage('configurationEepromSaved'));

2
tabs/setup.js
View file

@ -71,7 +71,7 @@ TABS.setup.initialize = function (callback) {
self.initializeInstruments();
$('a.resetSettings').on('click', function () {
if (confirm(i18n.getMessage('confirm_reset_settings'))) {
if (GUI.confirm(i18n.getMessage('confirm_reset_settings'))) {
MSP.send_message(MSPCodes.MSP_RESET_CONF, false, false, function () {
GUI.log(i18n.getMessage('initialSetupSettingsRestored'));