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

Run Prettier

This commit is contained in:
Penar Musaraj 2019-06-14 13:27:11 -04:00
parent d78741221e
commit d013e2f94a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/javascripts/connectors/user-custom-preferences/user-timezone.js.es6
View File

@ -7,13 +7,15 @@ export default {
// only show the instructions when browsing your own profile
if (currentUser && currentUser.id === user.id) {
instructions = I18n.t("discourse_calendar.timezone.instructions", { timezone: moment.tz.guess() });
instructions = I18n.t("discourse_calendar.timezone.instructions", {
timezone: moment.tz.guess()
});
}
component.setProperties({
instructions,
allTimezones: moment.tz.names(),
userTimezone: user.custom_fields.timezone,
userTimezone: user.custom_fields.timezone
});
component.addObserver("userTimezone", () => {

12
assets/javascripts/initializers/discourse-calendar.js.es6
View File

@ -24,7 +24,7 @@ function initializeDiscourseCalendar(api) {
api.decorateCooked(attachCalendar, { onlyStream: true });
api.registerCustomPostMessageCallback("calendar_change", (topicController) => {
api.registerCustomPostMessageCallback("calendar_change", topicController => {
const stream = topicController.get("model.postStream");
const post = stream.findLoadedPost(stream.get("firstPostId"));
const $op = $(".topic-post article#post_1");
@ -193,14 +193,15 @@ function initializeDiscourseCalendar(api) {
calendar.setOption("eventClick", ({ event }) => {
const { postNumber } = event.extendedProps;
if (!postNumber) return;
_topicController = _topicController || api.container.lookup("controller:topic");
_topicController =
_topicController || api.container.lookup("controller:topic");
_topicController.send("jumpToPost", postNumber);
});
calendar.setOption("eventMouseEnter", ({ event, jsEvent }) => {
const { htmlContent } = event.extendedProps;
if (!htmlContent) return;
showPopover(jsEvent, { htmlContent })
showPopover(jsEvent, { htmlContent });
});
calendar.setOption("eventMouseLeave", ({ jsEvent }) => {
@ -231,7 +232,10 @@ function initializeDiscourseCalendar(api) {
);
const excerpt = detail.message.split("\n").filter(e => e);
if (excerpt.length && (post.topic_id && holidayCalendarTopicId !== post.topic_id)) {
if (
excerpt.length &&
(post.topic_id && holidayCalendarTopicId !== post.topic_id)
) {
event.title = excerpt[0];
} else {
event.title = detail.username;