discourse
/
discourse-calendar
mirror of https://github.com/discourse/discourse-calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/discourse/components/events-calendar.js.es6 → assets/javascripts/discourse/components/upcoming-events-calendar.js.es6
View File

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

1
assets/javascripts/discourse/templates/components/events-calendar.hbs
View File

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

1
assets/javascripts/discourse/templates/components/upcoming-events-calendar.hbs Normal file
View File

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

2
assets/javascripts/discourse/templates/discourse-post-event-upcoming-events-index.hbs
View File

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

2
assets/stylesheets/common/events-calendar.scss → assets/stylesheets/common/upcoming-events-calendar.scss
View File

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

2
plugin.rb
View File

@ -14,7 +14,7 @@ enabled_site_setting :calendar_enabled
register_asset "stylesheets/vendor/fullcalendar.min.css" register_asset "stylesheets/vendor/fullcalendar.min.css"
register_asset "stylesheets/common/discourse-calendar.scss" 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.scss"
register_asset "stylesheets/common/discourse-post-event-preview.scss" register_asset "stylesheets/common/discourse-post-event-preview.scss"
register_asset "stylesheets/common/discourse-post-event-builder.scss" register_asset "stylesheets/common/discourse-post-event-builder.scss"