Skip to content

Support for configuring FontAwesome class in calendar-module: #2949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rejas merged 4 commits into from
Oct 16, 2022
Merged

Support for configuring FontAwesome class in calendar-module: #2949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c29e2e7
Addded support for different classNames in Font Awesome.
Oct 16, 2022
c64eddf
Merge remote-tracking branch 'MichMich/develop' into bugfix/facebook-…
Oct 16, 2022
da68935
Updated changelog.
Oct 16, 2022
482c468
fixed tests
Oct 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Special thanks to: @rejas, @sdetweil

- Correctly show apparent temperature in SMHI weather provider
- Ensure updatenotification module isn't shown when local is _ahead_ of remote
- Possibility to change FontAwesome class in calendar, so icons like `fab fa-facebook-square` works.

## [2.21.0] - 2022-10-01

Expand Down
8 changes: 7 additions & 1 deletion modules/default/calendar/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Module.register("calendar", {
limitDays: 0, // Limit the number of days shown, 0 = no limit
displaySymbol: true,
defaultSymbol: "calendar-alt", // Fontawesome Symbol see https://fontawesome.com/cheatsheet?from=io
defaultSymbolClassName: "fas fa-fw fa-",
showLocation: false,
displayRepeatingCountTitle: false,
defaultRepeatingCountTitle: "",
Expand Down Expand Up @@ -247,7 +248,7 @@ Module.register("calendar", {
const symbols = this.symbolsForEvent(event);
symbols.forEach((s, index) => {
const symbol = document.createElement("span");
symbol.className = "fas fa-fw fa-" + s;
symbol.className = s;
if (index > 0) {
symbol.style.paddingLeft = "5px";
}
Expand Down Expand Up @@ -771,6 +772,11 @@ Module.register("calendar", {

getCalendarPropertyAsArray: function (url, property, defaultValue) {
let p = this.getCalendarProperty(url, property, defaultValue);
if (property === "symbol" || property === "recurringSymbol" || property === "fullDaySymbol") {
const className = this.getCalendarProperty(url, "symbolClassName", this.config.defaultSymbolClassName);
p = className + p;
}

if (!(p instanceof Array)) p = [p];
return p;
},
Expand Down