mirror of
https://github.com/iNavFlight/inav-configurator.git
synced 2025-07-15 12:25:13 +03:00
Block configurator until defaults have been applied
This commit is contained in:
parent
a78a6baad0
commit
ada5bf6950
4 changed files with 30 additions and 0 deletions
|
@ -37,6 +37,9 @@
|
||||||
"deviceReady": {
|
"deviceReady": {
|
||||||
"message": "Device - <span style=\"color: #37a8db\">Ready</span>"
|
"message": "Device - <span style=\"color: #37a8db\">Ready</span>"
|
||||||
},
|
},
|
||||||
|
"savingDefaults": {
|
||||||
|
"message": "Device - <span style=\"color: red\">Saving default settings</span>"
|
||||||
|
},
|
||||||
"fcNotConnected": {
|
"fcNotConnected": {
|
||||||
"message": "Not connected"
|
"message": "Not connected"
|
||||||
},
|
},
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var helper = helper || {};
|
var helper = helper || {};
|
||||||
|
var savingDefaultsModal;
|
||||||
|
|
||||||
helper.defaultsDialog = (function () {
|
helper.defaultsDialog = (function () {
|
||||||
|
|
||||||
|
@ -694,6 +695,7 @@ helper.defaultsDialog = (function () {
|
||||||
GUI.tab_switch_cleanup(function () {
|
GUI.tab_switch_cleanup(function () {
|
||||||
MSP.send_message(MSPCodes.MSP_SET_REBOOT, false, false, function () {
|
MSP.send_message(MSPCodes.MSP_SET_REBOOT, false, false, function () {
|
||||||
//noinspection JSUnresolvedVariable
|
//noinspection JSUnresolvedVariable
|
||||||
|
savingDefaultsModal.close();
|
||||||
GUI.log(chrome.i18n.getMessage('deviceRebooting'));
|
GUI.log(chrome.i18n.getMessage('deviceRebooting'));
|
||||||
GUI.handleReconnect();
|
GUI.handleReconnect();
|
||||||
});
|
});
|
||||||
|
@ -705,13 +707,25 @@ helper.defaultsDialog = (function () {
|
||||||
};
|
};
|
||||||
|
|
||||||
privateScope.onPresetClick = function (event) {
|
privateScope.onPresetClick = function (event) {
|
||||||
|
savingDefaultsModal = new jBox('Modal', {
|
||||||
|
width: 400,
|
||||||
|
height: 100,
|
||||||
|
animation: false,
|
||||||
|
closeOnClick: false,
|
||||||
|
closeOnEsc: false,
|
||||||
|
content: $('#modal-saving-defaults')
|
||||||
|
}).open();
|
||||||
|
|
||||||
$container.hide();
|
$container.hide();
|
||||||
|
|
||||||
let selectedDefaultPreset = data[$(event.currentTarget).data("index")];
|
let selectedDefaultPreset = data[$(event.currentTarget).data("index")];
|
||||||
if (selectedDefaultPreset && selectedDefaultPreset.settings) {
|
if (selectedDefaultPreset && selectedDefaultPreset.settings) {
|
||||||
|
|
||||||
mspHelper.loadBfConfig(function () {
|
mspHelper.loadBfConfig(function () {
|
||||||
privateScope.setFeaturesBits(selectedDefaultPreset)
|
privateScope.setFeaturesBits(selectedDefaultPreset)
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
savingDefaultsModal.close();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
10
main.css
10
main.css
|
@ -2155,6 +2155,16 @@ select {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#modal-saving-defaults {
|
||||||
|
/* width: 100%; */
|
||||||
|
height: 90px;
|
||||||
|
background: url(../images/loading-bars.svg) no-repeat center 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
#modal-saving-defaults div {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
.subtab__header {
|
.subtab__header {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
height: auto;
|
height: auto;
|
||||||
|
|
|
@ -296,6 +296,9 @@
|
||||||
<div id="modal-reconnect" class="is-hidden">
|
<div id="modal-reconnect" class="is-hidden">
|
||||||
<div data-i18n="deviceRebooting"></div>
|
<div data-i18n="deviceRebooting"></div>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="modal-saving-defaults" class="is-hidden">
|
||||||
|
<div data-i18n="savingDefaults"></div>
|
||||||
|
</div>
|
||||||
<div id="defaults-wrapper" style="display: none">
|
<div id="defaults-wrapper" style="display: none">
|
||||||
<div class="defaults-dialog__background"></div>
|
<div class="defaults-dialog__background"></div>
|
||||||
<div class="defaults-dialog__content">
|
<div class="defaults-dialog__content">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue