Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: screenOnRoute sometimes failed

Browse source
This commit is contained in:
the-djmaze 2023-02-11 20:41:54 +01:00
parent 415102aa37
commit e4b0d43b3d
1 changed files with 40 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dev/Knoin/Knoin.js
View file

@ -169,22 +169,14 @@ const
* @returns {void} * @returns {void}
*/ */
screenOnRoute = (screenName, subPart) => { screenOnRoute = (screenName, subPart) => {
let vmScreen = null, screenName = screenName || defaultScreenName;
isSameScreen = false; if (screenName && fireEvent('sm-show-screen', screenName, 1)) {
if (null == screenName || '' == screenName) {
screenName = defaultScreenName;
}
if (fireEvent('sm-show-screen', screenName, 1)) {
// Close all popups // Close all popups
for (let vm of visiblePopups) { for (let vm of visiblePopups) {
(false === vm.onClose()) || vm.close(); (false === vm.onClose()) || vm.close();
} }
if (screenName) { let vmScreen = screen(screenName);
vmScreen = screen(screenName);
if (!vmScreen) { if (!vmScreen) {
vmScreen = screen(defaultScreenName); vmScreen = screen(defaultScreenName);
if (vmScreen) { if (vmScreen) {
@ -194,7 +186,7 @@ const
} }
if (vmScreen?.__started) { if (vmScreen?.__started) {
isSameScreen = currentScreen && vmScreen === currentScreen; let isSameScreen = currentScreen && vmScreen === currentScreen;
if (!vmScreen.__builded) { if (!vmScreen.__builded) {
vmScreen.__builded = true; vmScreen.__builded = true;
@ -231,7 +223,6 @@ const
}, 1); }, 1);
} }
} }
}
}; };