[DE PE SSE] Fix Bug 51823

This commit is contained in:
ShimaginAndrey 2021-08-11 12:28:33 +03:00
parent f58b6be9a1
commit 3f097d5bee
3 changed files with 16 additions and 3 deletions

View file

@ -64,7 +64,9 @@ const LongActionsController = () => {
if (action && !forceClose) {
setLongActionView(action);
} else {
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el);
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') ?
f7.dialog.close(loadMask.el) :
f7.dialog.close($$('.dialog-preloader'));
}
};
@ -171,6 +173,8 @@ const LongActionsController = () => {
if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) {
loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title;
} else if ($$('.dialog-preloader').hasClass('modal-in')) {
$$('.dialog-preloader').find('dialog-title').text(title);
} else {
loadMask = f7.dialog.preloader(title);
}

View file

@ -64,7 +64,9 @@ const LongActionsController = () => {
if (action && !forceClose) {
setLongActionView(action)
} else {
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el);
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') ?
f7.dialog.close(loadMask.el) :
f7.dialog.close($$('.dialog-preloader'));
}
};
@ -161,6 +163,8 @@ const LongActionsController = () => {
if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) {
loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title;
} else if ($$('.dialog-preloader').hasClass('modal-in')) {
$$('.dialog-preloader').find('dialog-title').text(title);
} else {
loadMask = f7.dialog.preloader(title);
}

View file

@ -66,7 +66,9 @@ const LongActionsController = () => {
if (action && !forceClose) {
setLongActionView(action)
} else {
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el);
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') ?
f7.dialog.close(loadMask.el) :
f7.dialog.close($$('.dialog-preloader'));
}
};
@ -167,8 +169,11 @@ const LongActionsController = () => {
}
if (action.type == Asc.c_oAscAsyncActionType.BlockInteraction) {
if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) {
loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title;
} else if ($$('.dialog-preloader').hasClass('modal-in')) {
$$('.dialog-preloader').find('dialog-title').text(title);
} else {
loadMask = f7.dialog.preloader(title);
}