DEV: Extract common calendar options (#604)

Extract common calendar options
discourse · Aug 28, 2024 · 66259cd · 66259cd
1 parent 57fa918
commit 66259cd
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 39 deletions.
diff --git a/assets/javascripts/discourse/components/upcoming-events-calendar.js b/assets/javascripts/discourse/components/upcoming-events-calendar.js
@@ -5,12 +5,8 @@ import loadScript from "discourse/lib/load-script";
 import Category from "discourse/models/category";
 import getURL from "discourse-common/lib/get-url";
 import { formatEventName } from "../helpers/format-event-name";
-import {
-  getCalendarButtonsText,
-  getCurrentBcp47Locale,
-} from "../lib/calendar-locale";
+import fullCalendarDefaultOptions from "../lib/full-calendar-default-options";
 import { isNotFullDayEvent } from "../lib/guess-best-date-format";
-import { buildPopover, destroyPopover } from "../lib/popover";
 
 export default Component.extend({
   tagName: "",
@@ -63,11 +59,7 @@ export default Component.extend({
 
     this._loadCalendar().then(() => {
       const fullCalendar = new window.FullCalendar.Calendar(calendarNode, {
-        locale: getCurrentBcp47Locale(),
-        buttonText: getCalendarButtonsText(),
-        eventClick: function () {
-          destroyPopover();
-        },
+        ...fullCalendarDefaultOptions(),
         eventPositioned: (info) => {
           if (siteSettings.events_max_rows === 0) {
             return;
@@ -93,14 +85,6 @@ export default Component.extend({
           }
           fullCalendar.updateSize();
         },
-        eventMouseEnter: function ({ event, jsEvent }) {
-          destroyPopover();
-          const htmlContent = event.title;
-          buildPopover(jsEvent, htmlContent);
-        },
-        eventMouseLeave: function () {
-          destroyPopover();
-        },
       });
       this._calendar = fullCalendar;
 

diff --git a/assets/javascripts/discourse/initializers/discourse-calendar.js b/assets/javascripts/discourse/initializers/discourse-calendar.js
@@ -12,11 +12,8 @@ import getURL from "discourse-common/lib/get-url";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import I18n from "I18n";
 import { formatEventName } from "../helpers/format-event-name";
-import {
-  getCalendarButtonsText,
-  getCurrentBcp47Locale,
-} from "../lib/calendar-locale";
 import { colorToHex, contrastColor, stringToColor } from "../lib/colors";
+import fullCalendarDefaultOptions from "../lib/full-calendar-default-options";
 import { isNotFullDayEvent } from "../lib/guess-best-date-format";
 import { buildPopover, destroyPopover } from "../lib/popover";
 
@@ -127,11 +124,7 @@ function initializeDiscourseCalendar(api) {
           let fullCalendar = new window.FullCalendar.Calendar(
             categoryEventNode,
             {
-              eventClick: function () {
-                destroyPopover();
-              },
-              locale: getCurrentBcp47Locale(),
-              buttonText: getCalendarButtonsText(),
+              ...fullCalendarDefaultOptions(),
               eventPositioned: (info) => {
                 if (siteSettings.events_max_rows === 0) {
                   return;
@@ -157,14 +150,6 @@ function initializeDiscourseCalendar(api) {
                 }
                 fullCalendar.updateSize();
               },
-              eventMouseEnter: function ({ event, jsEvent }) {
-                destroyPopover();
-                const htmlContent = event.title;
-                buildPopover(jsEvent, htmlContent);
-              },
-              eventMouseLeave: function () {
-                destroyPopover();
-              },
             }
           );
           const params = {
@@ -360,10 +345,9 @@ function initializeDiscourseCalendar(api) {
       $calendar.attr("data-calendar-show-add-to-calendar") !== "false";
 
     return new window.FullCalendar.Calendar($calendar[0], {
+      ...fullCalendarDefaultOptions(),
       timeZone,
       timeZoneImpl: "moment-timezone",
-      locale: getCurrentBcp47Locale(),
-      buttonText: getCalendarButtonsText(),
       nextDayThreshold: "06:00:00",
       displayEventEnd: true,
       height: 650,
@@ -395,7 +379,6 @@ function initializeDiscourseCalendar(api) {
 
         $calendarTitle.innerText = info.view.title;
       },
-
       eventPositioned: (info) => {
         _setTimezoneOffset(info);
       },

diff --git a/assets/javascripts/discourse/lib/calendar-locale.js b/assets/javascripts/discourse/lib/calendar-locale.js
@@ -1,7 +1,7 @@
 import I18n from "I18n";
 
 export function getCurrentBcp47Locale() {
-  return I18n.currentLocale().replace("_", "-");
+  return I18n.currentLocale().replace("_", "-").toLowerCase();
 }
 
 export function getCalendarButtonsText() {

diff --git a/assets/javascripts/discourse/lib/full-calendar-default-options.js b/assets/javascripts/discourse/lib/full-calendar-default-options.js
@@ -0,0 +1,23 @@
+import {
+  getCalendarButtonsText,
+  getCurrentBcp47Locale,
+} from "./calendar-locale";
+import { buildPopover, destroyPopover } from "./popover";
+
+export default function fullCalendarDefaultOptions() {
+  return {
+    eventClick: function () {
+      destroyPopover();
+    },
+    locale: getCurrentBcp47Locale(),
+    buttonText: getCalendarButtonsText(),
+    eventMouseEnter: function ({ event, jsEvent }) {
+      destroyPopover();
+      const htmlContent = event.title;
+      buildPopover(jsEvent, htmlContent);
+    },
+    eventMouseLeave: function () {
+      destroyPopover();
+    },
+  };
+}