mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-19 15:51:16 +02:00
Code Issues Releases Wiki Activity

Mithril 2 Update (#19)

Browse Source 
Update for Mithril 2
This commit is contained in:
Alexander Skvortsov
2020-09-23 22:56:13 -04:00
committed by GitHub
parent 7bf581d635
commit 418e656c9e
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/sticky/js/src/forum/addStickyControl.js
View File

@@ -7,10 +7,9 @@ export default function addStickyControl() {
extend(DiscussionControls, 'moderationControls', function(items, discussion) { extend(DiscussionControls, 'moderationControls', function(items, discussion) {
if (discussion.canSticky()) { if (discussion.canSticky()) {
items.add('sticky', Button.component({ items.add('sticky', Button.component({
children: app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.discussion_controls.unsticky_button' : 'flarum-sticky.forum.discussion_controls.sticky_button'),
icon: 'fas fa-thumbtack', icon: 'fas fa-thumbtack',
onclick: this.stickyAction.bind(discussion) onclick: this.stickyAction.bind(discussion)
})); }, app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.discussion_controls.unsticky_button' : 'flarum-sticky.forum.discussion_controls.sticky_button')));
} }
}); });

4
extensions/sticky/js/src/forum/addStickyExcerpt.js
View File

@@ -9,9 +9,9 @@ export default function addStickyControl() {
}); });
extend(DiscussionListItem.prototype, 'infoItems', function(items) { extend(DiscussionListItem.prototype, 'infoItems', function(items) {
const discussion = this.props.discussion; const discussion = this.attrs.discussion;
if (discussion.isSticky() && !this.props.params.q && !discussion.lastReadPostNumber()) { if (discussion.isSticky() && !this.attrs.params.q && !discussion.lastReadPostNumber()) {
const firstPost = discussion.firstPost(); const firstPost = discussion.firstPost();
if (firstPost) { if (firstPost) {

2
extensions/sticky/js/src/forum/components/DiscussionStickiedPost.js
View File

@@ -6,7 +6,7 @@ export default class DiscussionStickiedPost extends EventPost {
} }
descriptionKey() { descriptionKey() {
return this.props.post.content().sticky return this.attrs.post.content().sticky
? 'flarum-sticky.forum.post_stream.discussion_stickied_text' ? 'flarum-sticky.forum.post_stream.discussion_stickied_text'
: 'flarum-sticky.forum.post_stream.discussion_unstickied_text'; : 'flarum-sticky.forum.post_stream.discussion_unstickied_text';
} }