From 66719c04ce41080b0d3662b1bdf967168e1e1713 Mon Sep 17 00:00:00 2001 From: bugsounet Date: Sun, 6 Apr 2025 08:44:53 +0200 Subject: [PATCH 1/4] add order to config --- css/main.css | 13 +++++++++++++ js/loader.js | 3 ++- js/main.js | 5 ++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/css/main.css b/css/main.css index 0aa5c3418e..e981635bc2 100644 --- a/css/main.css +++ b/css/main.css @@ -239,3 +239,16 @@ sup { border-spacing: 0; border-collapse: separate; } + +/** + * Container Definitions. + */ + +.region .container { + display: flex; + flex-direction: column; +} + +.region .container.hidden { + display: none; +} diff --git a/js/loader.js b/js/loader.js index e823b0b620..59a5e7802f 100644 --- a/js/loader.js +++ b/js/loader.js @@ -108,7 +108,8 @@ const Loader = (function () { header: moduleData.header, configDeepMerge: typeof moduleData.configDeepMerge === "boolean" ? moduleData.configDeepMerge : false, config: moduleData.config, - classes: typeof moduleData.classes !== "undefined" ? `${moduleData.classes} ${module}` : module + classes: typeof moduleData.classes !== "undefined" ? `${moduleData.classes} ${module}` : module, + order: (typeof moduleData.order === "number" && Number.isInteger(moduleData.order)) ? moduleData.order : 0 }); }); diff --git a/js/main.js b/js/main.js index 7c0e9db390..c2a5605323 100644 --- a/js/main.js +++ b/js/main.js @@ -30,6 +30,8 @@ const MM = (function () { dom.className = `module ${dom.className} ${module.data.classes}`; } + dom.style.order = (typeof module.data.order === "number" && Number.isInteger(module.data.order)) ? module.data.order : 0; + dom.opacity = 0; wrapper.appendChild(dom); @@ -463,7 +465,8 @@ const MM = (function () { } }); - wrapper.style.display = showWrapper ? "block" : "none"; + // move container definitions to main CSS + wrapper.className = showWrapper ? "container" : "container hidden"; }); }; From dfbe91cdbfbe675fd9d6633f54681f94bebd85fa Mon Sep 17 00:00:00 2001 From: bugsounet Date: Sun, 6 Apr 2025 08:53:55 +0200 Subject: [PATCH 2/4] Add ChangeLog entry --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bde0b129a3..d7de8fcdbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 planned for 2025-07-01 +### Added + +- [config] Allow to change module order for final renderer (or dynamicaly with CSS): Feature `order` in config. (#xxxx) + +### Changed + +### Removed + +### Updated + +### Fixed + ## [2.31.0] - 2025-04-01 Thanks to: @Developer-Incoming, @eltociear, @geraki, @khassel, @KristjanESPERANTO, @MagMar94, @mixasgr, @n8many, @OWL4C, @rejas, @savvadam, @sdetweil. From b5baff610e06711d0693822add39648312f81c1a Mon Sep 17 00:00:00 2001 From: bugsounet Date: Sun, 6 Apr 2025 09:28:31 +0200 Subject: [PATCH 3/4] add PR number --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7de8fcdbd..990cd9e03e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ planned for 2025-07-01 ### Added -- [config] Allow to change module order for final renderer (or dynamicaly with CSS): Feature `order` in config. (#xxxx) +- [config] Allow to change module order for final renderer (or dynamicaly with CSS): Feature `order` in config. (#3762) ### Changed From b38dcf964528a49d213809bf8a185807d0d0d10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bugsounet=20-=20C=C3=A9dric?= Date: Wed, 7 May 2025 14:00:08 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aad2709f0a..554c64df01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,6 @@ planned for 2025-07-01 ### Added - [config] Allow to change module order for final renderer (or dynamicaly with CSS): Feature `order` in config. (#3762) - -### Fixed - - [clock] Added option 'disableNextEvent' to hide next sun event. ### Changed