github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-30 16:33:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Pass currentUser to post-menu button builders (#9752)

Browse Source 
Adding this from a review; I was using Discourse.currentUser which is frowned upon now.

Passing currentUser both for regular post menu buttons and extra buttons attached via the plugin API.

Lots of formatting/whitespace changes, best off reviewing with ?w=1
This commit is contained in:
Martin Brennan 2020-05-12 14:09:38 +10:00 committed by GitHub
parent 3c423faafd
commit 39a2d90e0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
app/assets/javascripts/discourse/app/widgets/post-menu.js
View File

@ -51,10 +51,10 @@ function registerButton(name, builder) {
}
export function buildButton(name, widget) {
let { attrs, state, siteSettings, settings } = widget;
let { attrs, state, siteSettings, settings, currentUser } = widget;
let builder = _builders[name];
if (builder) {
let button = builder(attrs, state, siteSettings, settings);
let button = builder(attrs, state, siteSettings, settings, currentUser);
if (button && !button.id) {
button.id = name;
}
@ -287,46 +287,49 @@ registerButton("reply", (attrs, state, siteSettings, postMenuSettings) => {
return args;
});
registerButton("bookmark", attrs => {
if (!attrs.canBookmark) {
return;
}
let classNames = ["bookmark", "with-reminder"];
let title = "bookmarks.not_bookmarked";
let titleOptions = { name: "" };
if (attrs.bookmarked) {
classNames.push("bookmarked");
if (attrs.bookmarkReminderAt) {
let formattedReminder = formattedReminderTime(
attrs.bookmarkReminderAt,
Discourse.currentUser.resolvedTimezone(Discourse.currentUser)
);
title = "bookmarks.created_with_reminder";
titleOptions.date = formattedReminder;
} else {
title = "bookmarks.created";
registerButton(
"bookmark",
(attrs, _state, _siteSettings, _settings, currentUser) => {
if (!attrs.canBookmark) {
return;
}
if (attrs.bookmarkName) {
titleOptions.name = `. ${attrs.bookmarkName}`;
}
}
let classNames = ["bookmark", "with-reminder"];
let title = "bookmarks.not_bookmarked";
let titleOptions = { name: "" };
return {
id: attrs.bookmarked ? "unbookmark" : "bookmark",
action: "toggleBookmark",
title,
titleOptions,
className: classNames.join(" "),
icon:
attrs.bookmarkReminderAt || attrs.bookmarkReminderType === "at_desktop"
? "discourse-bookmark-clock"
: "bookmark"
};
});
if (attrs.bookmarked) {
classNames.push("bookmarked");
if (attrs.bookmarkReminderAt) {
let formattedReminder = formattedReminderTime(
attrs.bookmarkReminderAt,
currentUser.resolvedTimezone(currentUser)
);
title = "bookmarks.created_with_reminder";
titleOptions.date = formattedReminder;
} else {
title = "bookmarks.created";
}
if (attrs.bookmarkName) {
titleOptions.name = `. ${attrs.bookmarkName}`;
}
}
return {
id: attrs.bookmarked ? "unbookmark" : "bookmark",
action: "toggleBookmark",
title,
titleOptions,
className: classNames.join(" "),
icon:
attrs.bookmarkReminderAt || attrs.bookmarkReminderType === "at_desktop"
? "discourse-bookmark-clock"
: "bookmark"
};
}
);
registerButton("admin", attrs => {
if (!attrs.canManage && !attrs.canWiki) {
@ -497,7 +500,13 @@ export default createWidget("post-menu", {
Object.values(_extraButtons).forEach(builder => {
if (builder) {
const buttonAtts = builder(attrs, this.state, this.siteSettings);
const buttonAtts = builder(
attrs,
this.state,
this.siteSettings,
this.settings,
this.currentUser
);
if (buttonAtts) {
const { position, beforeButton, afterButton } = buttonAtts;
delete buttonAtts.position;