FIX: rename events-calendar to upcoming-events-calendar

This was causing a name clashing with discourse-envets.
This commit is contained in:
jjaffeux 2020-05-03 09:49:20 +02:00
parent 8ccc7f3d85
commit fdabeb07bc
6 changed files with 5 additions and 5 deletions

View File

@ -26,7 +26,7 @@ export default Component.extend({
this._super(...arguments);
this._loadCalendar().then(() => {
const calendarNode = document.getElementById("events-calendar");
const calendarNode = document.getElementById("upcoming-events-calendar");
if (calendarNode) {
this._calendar = new window.FullCalendar.Calendar(calendarNode, {});

View File

@ -1 +0,0 @@
<div id="events-calendar"></div>

View File

@ -0,0 +1 @@
<div id="upcoming-events-calendar"></div>

View File

@ -1,3 +1,3 @@
<div class="discourse-post-event-upcoming-events">
{{events-calendar events=events}}
{{upcoming-events-calendar events=events}}
</div>

View File

@ -1,4 +1,4 @@
#events-calendar {
#upcoming-events-calendar {
&.fc-unthemed {
tbody,
thead,

View File

@ -14,7 +14,7 @@ enabled_site_setting :calendar_enabled
register_asset "stylesheets/vendor/fullcalendar.min.css"
register_asset "stylesheets/common/discourse-calendar.scss"
register_asset "stylesheets/common/events-calendar.scss"
register_asset "stylesheets/common/upcoming-events-calendar.scss"
register_asset "stylesheets/common/discourse-post-event.scss"
register_asset "stylesheets/common/discourse-post-event-preview.scss"
register_asset "stylesheets/common/discourse-post-event-builder.scss"