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

Fix steps

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2022-05-30 13:54:39 +02:00
parent cf57493fdb
commit cfdfff0c94
2 changed files with 43 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

83
js/defaults_dialog.js
View file

@ -49,54 +49,57 @@ helper.defaultsDialog = (function (data) {
}, },
privateScope.wizard = function (selectedDefaultPreset, wizardStep) { privateScope.wizard = function (selectedDefaultPreset, wizardStep) {
const steps = selectedDefaultPreset.wizardPages; const steps = selectedDefaultPreset.wizardPages;
const stepsCount = selectedDefaultPreset.wizardPages.length; const stepsCount = selectedDefaultPreset.wizardPages.length;
const stepName = steps[wizardStep]; const stepName = steps[wizardStep];
console.log(steps[wizardStep], wizardStep, stepsCount); console.log(steps[wizardStep], wizardStep, stepsCount);
if (wizardStep >= stepsCount - 1) { if (wizardStep >= stepsCount) {
//This is the last step, time to finalize //This is the last step, time to finalize
$container.hide(); $container.hide();
privateScope.saveAndReboot(); privateScope.saveAndReboot();
} else { } else {
const $content = $container.find('.defaults-dialog__wizard'); const $content = $container.find('.defaults-dialog__wizard');
$.get("./wizard/" + stepName + ".html", function (data) { $content.unbind();
$.get("./wizard/" + stepName + ".html", function (data) {
$content.html("");
$(data).appendTo($content);
$.get("./wizard/buttons.html", function (data) {
$(data).appendTo($content); $(data).appendTo($content);
$.get("./wizard/buttons.html", function (data) { $content.on('click', '#wizard-next', function () {
$(data).appendTo($content); privateScope.saveWizardStep(selectedDefaultPreset, wizardStep);
$container.on('click', '#wizard-next', function () {
privateScope.saveWizardStep(selectedDefaultPreset, wizardStep);
});
$container.on('click', '#wizard-skip', function () {
privateScope.wizard(selectedDefaultPreset, wizardStep + 1);
});
if (stepName == "receiver") {
privateScope.handleTabLoadReceiver($container);
}
Settings.configureInputs().then(
function () {
console.log('configure done');
$container.find('.defaults-dialog__content').hide();
$container.find('.defaults-dialog__wizard').show();
savingDefaultsModal.close();
$container.show();
}
);
}); });
});
}
}; $content.on('click', '#wizard-skip', function () {
privateScope.wizard(selectedDefaultPreset, wizardStep + 1);
});
if (stepName == "receiver") {
privateScope.handleTabLoadReceiver($content);
}
Settings.configureInputs().then(
function () {
console.log('configure done');
$container.find('.defaults-dialog__content').hide();
$container.find('.defaults-dialog__wizard').show();
savingDefaultsModal.close();
$container.show();
}
);
});
});
}
};
privateScope.saveAndReboot = function () { privateScope.saveAndReboot = function () {
GUI.tab_switch_cleanup(function () { GUI.tab_switch_cleanup(function () {

19
js/defaults_dialog_entries.js
View file

@ -1,24 +1,5 @@
var helper = helper || {}; var helper = helper || {};
helper.defaultsDialogReceivers = {
0: "SPEK1024",
1: "SPEK2048",
2: "SBUS",
3: "SUMD",
4: "SUMH",
5: "XB-B",
6: "XB-B-RJ01",
7: "IBUS",
8: "JETIEXBUS",
9: "CRSF",
10: "FPORT",
11: "SBUS_FAST",
12: "FPORT2",
13: "SRXL2",
14: "GHST",
15: "MAVLINK"
}
helper.defaultsDialogData = [ helper.defaultsDialogData = [
{ {
"title": 'Test', "title": 'Test',