mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2025-01-27 22:45:58 -05:00
properly fix multiple dialog popups in a row
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
parent
73c18c4dd5
commit
90b71e924f
@ -6280,6 +6280,7 @@
|
|||||||
xxModal.show();
|
xxModal.show();
|
||||||
document.getElementById(okButtonId).onclick = function () {
|
document.getElementById(okButtonId).onclick = function () {
|
||||||
if (typeof okCallback === 'function' && okCallback) {
|
if (typeof okCallback === 'function' && okCallback) {
|
||||||
|
xxdialogMode = 0; // reset xxdialogMode back to 0 because we might be opening up another dialog and it checks if one is already open
|
||||||
var callbackResult = okCallback(b, tag);
|
var callbackResult = okCallback(b, tag);
|
||||||
// Close the modal by default unless `false` is explicitly returned from the callback function
|
// Close the modal by default unless `false` is explicitly returned from the callback function
|
||||||
if (callbackResult !== false) { xxModal.hide(); }
|
if (callbackResult !== false) { xxModal.hide(); }
|
||||||
@ -9211,7 +9212,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function deviceActionFunctionEx() {
|
function deviceActionFunctionEx() {
|
||||||
xxdialogMode = 0; // reset xxdialogMode back to 0
|
|
||||||
var op = Q('d2deviceop').value;
|
var op = Q('d2deviceop').value;
|
||||||
if (op == 100) {
|
if (op == 100) {
|
||||||
// Device wake
|
// Device wake
|
||||||
@ -10186,7 +10186,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function askRdpCredentialsEx() {
|
function askRdpCredentialsEx() {
|
||||||
xxdialogMode = 0;
|
|
||||||
var width = null, height = null;
|
var width = null, height = null;
|
||||||
if (desktopsettings.rdpsize) {
|
if (desktopsettings.rdpsize) {
|
||||||
if (desktopsettings.rdpsize == 'browser') {
|
if (desktopsettings.rdpsize == 'browser') {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user