kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2026-06-09 03:34:51 +00:00
Code Issues Projects Releases Wiki Activity

refactor(main): simplify updateDomWithContent async flow (#4182)

Browse Source 
This keeps the same behavior, but makes the function easier to read.

- moved to async/await with early returns
- kept only one small Promise wrapper around the _hideModule callback
- removed a duplicate speed check
- cleaned up JSDoc so timing/return details are clearer

No runtime change intended; hide/show sequencing stays the same.
This commit is contained in:
Kristjan ESPERANTO
2026-06-07 23:18:20 +02:00
committed by GitHub
parent 5d11b5d73b
commit e747db16d4
1 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
js/main.js
View File

@@ -151,43 +151,34 @@ function _updateDom (module, updateOptions, createAnimatedDom = false) {
/**
* Update the dom with the specified content
* @param {Module} module The module that needs an update.
* @param {number} [speed] The (optional) number of microseconds for the animation.
* @param {number} [speed] The (optional) number of milliseconds for the animation.
* @param {string} newHeader The new header that is generated.
* @param {HTMLElement} newContent The new content that is generated.
* @param {string} [animateOut] AnimateCss animation name before hidden
* @param {string} [animateIn] AnimateCss animation name on show
* @param {boolean} [createAnimatedDom] for displaying only animateIn (used on first start)
* @returns {Promise} Resolved when the module dom has been updated.
* @param {boolean} [createAnimatedDom] If true, apply content and trigger only animateIn (used on first start).
* @returns {Promise<void>} Resolved after the module DOM update is applied or hide/show transition is scheduled.
*/
function updateDomWithContent (module, speed, newHeader, newContent, animateOut, animateIn, createAnimatedDom = false) {
return new Promise(function (resolve) {
if (module.hidden || !speed) {
updateModuleContent(module, newHeader, newContent);
resolve();
return;
}
async function updateDomWithContent (module, speed, newHeader, newContent, animateOut, animateIn, createAnimatedDom = false) {
if (module.hidden || !speed) {
updateModuleContent(module, newHeader, newContent);
return;
}
if (!moduleNeedsUpdate(module, newHeader, newContent)) {
resolve();
return;
}
if (!moduleNeedsUpdate(module, newHeader, newContent)) {
return;
}
if (!speed) {
updateModuleContent(module, newHeader, newContent);
resolve();
return;
}
if (createAnimatedDom && animateIn !== null) {
Log.debug(`${module.identifier} createAnimatedDom (${animateIn})`);
updateModuleContent(module, newHeader, newContent);
if (!module.hidden) {
_showModule(module, speed, null, { animate: animateIn });
}
resolve();
return;
if (createAnimatedDom && animateIn !== null) {
Log.debug(`${module.identifier} createAnimatedDom (${animateIn})`);
updateModuleContent(module, newHeader, newContent);
if (!module.hidden) {
_showModule(module, speed, null, { animate: animateIn });
}
return;
}
await new Promise((resolve) => {
_hideModule(
module,
speed / 2,