Merge branch 'develop' into cleanup/yr

rejas · Oct 12, 2023 · 829a087 · 829a087
2 parents ec70008 + b067711
commit 829a087
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ _This release is scheduled to be released on 2024-01-01._
 
 ### Fixed
 
+- Fix the option eventClass on customEvents.
+
 ## [2.25.0] - 2023-10-01
 
 Thanks to: @bugsounet, @dgoth, @dependabot, @kenzal, @Knapoc, @KristjanESPERANTO, @martingron, @NolanKingdon, @Paranoid93, @TeddyStarinvest and @Ybbet.

diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
@@ -335,7 +335,6 @@ Module.register("calendar", {
 							if (this.config.displaySymbol && this.config.coloredSymbol) {
 								symbolWrapper.style.cssText = `color:${this.config.customEvents[ev].color}`;
 							}
-							break;
 						}
 						if (typeof this.config.customEvents[ev].eventClass !== "undefined" && this.config.customEvents[ev].eventClass !== "") {
 							eventWrapper.className += ` ${this.config.customEvents[ev].eventClass}`;