Skip to content

[IMP] Refresh FullCalendar resources. #62

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

Open
wants to merge 1 commit into
base: 18.0
Choose a base branch
from
Open

[IMP] Refresh FullCalendar resources. #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 25 additions & 24 deletions addons/web/static/lib/fullcalendar/timegrid/index.global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,30 +233,6 @@ FullCalendar.TimeGrid = (function (exports, core, internal$1, preact, internal$2
],
});
}
if (allDayContent) {
sections.push({
type: 'body',
key: 'all-day',
syncRowHeights: true,
chunks: [
{
key: 'axis',
rowContent: (contentArg) => (preact.createElement("tr", { role: "presentation" }, this.renderTableRowAxis(contentArg.rowSyncHeights[0]))),
},
{
key: 'cols',
content: allDayContent,
},
],
});
sections.push({
key: 'all-day-divider',
type: 'body',
outerContent: ( // TODO: rename to cellContent so don't need to define <tr>?
preact.createElement("tr", { role: "presentation", className: "fc-scrollgrid-section" },
preact.createElement("td", { colSpan: 2, className: 'fc-timegrid-divider ' + context.theme.getClass('tableCellShaded') }))),
});
}
let isNowIndicator = context.options.nowIndicator;
sections.push({
type: 'body',
Expand Down Expand Up @@ -291,6 +267,31 @@ FullCalendar.TimeGrid = (function (exports, core, internal$1, preact, internal$2
},
],
});
// HACK manually moved to footer
if (allDayContent) {
sections.push({
key: 'all-day-divider',
type: 'body',
outerContent: ( // TODO: rename to cellContent so don't need to define <tr>?
preact.createElement("tr", { role: "presentation", className: "fc-scrollgrid-section" },
preact.createElement("td", { colSpan: 2, className: 'fc-timegrid-divider ' + context.theme.getClass('tableCellShaded') }))),
});
sections.push({
type: 'body',
key: 'all-day',
syncRowHeights: true,
chunks: [
{
key: 'axis',
rowContent: (contentArg) => (preact.createElement("tr", { role: "presentation" }, this.renderTableRowAxis(contentArg.rowSyncHeights[0]))),
},
{
key: 'cols',
content: allDayContent,
},
],
});
}
if (stickyFooterScrollbar) {
sections.push({
key: 'footer',
Expand Down
3 changes: 3 additions & 0 deletions addons/web/static/src/views/calendar/hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ export function useFullCalendar(refName, params) {
});

onPatched(() => {
if (instance.refetchResources) {
instance.refetchResources();
}
instance.refetchEvents();
instance.setOption("weekends", component.props.isWeekendVisible);
if (params.weekNumbers && component.props.model.scale === "year") {
Expand Down