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

Format JS

Browse Source
This commit is contained in:
Ian Morland
2022-01-07 17:31:22 +00:00
parent a4b678ce51
commit 30b2fcce66
7 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/subscriptions/js/src/forum/addSubscriptionBadge.js
View File

@@ -4,7 +4,7 @@ import Discussion from 'flarum/common/models/Discussion';
import Badge from 'flarum/common/components/Badge'; import Badge from 'flarum/common/components/Badge';
export default function addSubscriptionBadge() { export default function addSubscriptionBadge() {
extend(Discussion.prototype, 'badges', function(badges) { extend(Discussion.prototype, 'badges', function (badges) {
let badge; let badge;
switch (this.subscription()) { switch (this.subscription()) {
@@ -12,7 +12,7 @@ export default function addSubscriptionBadge() {
badge = Badge.component({ badge = Badge.component({
label: app.translator.trans('flarum-subscriptions.forum.badge.following_tooltip'), label: app.translator.trans('flarum-subscriptions.forum.badge.following_tooltip'),
icon: 'fas fa-star', icon: 'fas fa-star',
type: 'following' type: 'following',
}); });
break; break;
@@ -20,12 +20,12 @@ export default function addSubscriptionBadge() {
badge = Badge.component({ badge = Badge.component({
label: app.translator.trans('flarum-subscriptions.forum.badge.ignoring_tooltip'), label: app.translator.trans('flarum-subscriptions.forum.badge.ignoring_tooltip'),
icon: 'far fa-eye-slash', icon: 'far fa-eye-slash',
type: 'ignoring' type: 'ignoring',
}); });
break; break;
default: default:
// no default // no default
} }
if (badge) { if (badge) {

26
extensions/subscriptions/js/src/forum/addSubscriptionControls.js
View File

@@ -7,28 +7,34 @@ import DiscussionControls from 'flarum/forum/utils/DiscussionControls';
import SubscriptionMenu from './components/SubscriptionMenu'; import SubscriptionMenu from './components/SubscriptionMenu';
export default function addSubscriptionControls() { export default function addSubscriptionControls() {
extend(DiscussionControls, 'userControls', function(items, discussion, context) { extend(DiscussionControls, 'userControls', function (items, discussion, context) {
if (app.session.user && !(context instanceof DiscussionPage)) { if (app.session.user && !(context instanceof DiscussionPage)) {
const states = { const states = {
none: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.follow_button'), icon: 'fas fa-star', save: 'follow'}, none: { label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.follow_button'), icon: 'fas fa-star', save: 'follow' },
follow: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unfollow_button'), icon: 'far fa-star', save: null}, follow: { label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unfollow_button'), icon: 'far fa-star', save: null },
ignore: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unignore_button'), icon: 'fas fa-eye', save: null} ignore: { label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unignore_button'), icon: 'fas fa-eye', save: null },
}; };
const subscription = discussion.subscription() || 'none'; const subscription = discussion.subscription() || 'none';
items.add('subscription', Button.component({ items.add(
icon: states[subscription].icon, 'subscription',
onclick: discussion.save.bind(discussion, {subscription: states[subscription].save}) Button.component(
}, states[subscription].label)); {
icon: states[subscription].icon,
onclick: discussion.save.bind(discussion, { subscription: states[subscription].save }),
},
states[subscription].label
)
);
} }
}); });
extend(DiscussionPage.prototype, 'sidebarItems', function(items) { extend(DiscussionPage.prototype, 'sidebarItems', function (items) {
if (app.session.user) { if (app.session.user) {
const discussion = this.discussion; const discussion = this.discussion;
items.add('subscription', SubscriptionMenu.component({discussion}), 80); items.add('subscription', SubscriptionMenu.component({ discussion }), 80);
} }
}); });
} }

17
extensions/subscriptions/js/src/forum/addSubscriptionFilter.js
View File

@@ -6,14 +6,21 @@ import DiscussionListState from 'flarum/forum/states/DiscussionListState';
import GlobalSearchState from 'flarum/forum/states/GlobalSearchState'; import GlobalSearchState from 'flarum/forum/states/GlobalSearchState';
export default function addSubscriptionFilter() { export default function addSubscriptionFilter() {
extend(IndexPage.prototype, 'navItems', function(items) { extend(IndexPage.prototype, 'navItems', function (items) {
if (app.session.user) { if (app.session.user) {
const params = app.search.stickyParams(); const params = app.search.stickyParams();
items.add('following', LinkButton.component({ items.add(
href: app.route('following', params), 'following',
icon: 'fas fa-star' LinkButton.component(
}, app.translator.trans('flarum-subscriptions.forum.index.following_link')), 50); {
href: app.route('following', params),
icon: 'fas fa-star',
},
app.translator.trans('flarum-subscriptions.forum.index.following_link')
),
50
);
} }
}); });

26
extensions/subscriptions/js/src/forum/addSubscriptionSettings.js
View File

@@ -5,19 +5,23 @@ import Switch from 'flarum/common/components/Switch';
export default function () { export default function () {
extend(SettingsPage.prototype, 'notificationsItems', function (items) { extend(SettingsPage.prototype, 'notificationsItems', function (items) {
items.add('followAfterReply', items.add(
Switch.component({ 'followAfterReply',
state: this.user.preferences().followAfterReply, Switch.component(
onchange: (value) => { {
this.followAfterReplyLoading = true; state: this.user.preferences().followAfterReply,
onchange: (value) => {
this.followAfterReplyLoading = true;
this.user.savePreferences({ followAfterReply: value }).then(() => { this.user.savePreferences({ followAfterReply: value }).then(() => {
this.followAfterReplyLoading = false; this.followAfterReplyLoading = false;
m.redraw(); m.redraw();
}); });
},
loading: this.followAfterReplyLoading,
}, },
loading: this.followAfterReplyLoading app.translator.trans('flarum-subscriptions.forum.settings.follow_after_reply_label')
}, app.translator.trans('flarum-subscriptions.forum.settings.follow_after_reply_label')) )
); );
}); });
} }

2
extensions/subscriptions/js/src/forum/components/NewPostNotification.js
View File

@@ -15,6 +15,6 @@ export default class NewPostNotification extends Notification {
} }
content() { content() {
return app.translator.trans('flarum-subscriptions.forum.notifications.new_post_text', {user: this.attrs.notification.fromUser()}); return app.translator.trans('flarum-subscriptions.forum.notifications.new_post_text', { user: this.attrs.notification.fromUser() });
} }
} }

4
extensions/subscriptions/js/src/forum/components/SubscriptionMenuItem.js
View File

@@ -5,9 +5,9 @@ export default class SubscriptionMenuItem extends Component {
view() { view() {
return ( return (
<button className="SubscriptionMenuItem hasIcon" onclick={this.attrs.onclick}> <button className="SubscriptionMenuItem hasIcon" onclick={this.attrs.onclick}>
{this.attrs.active ? icon('fas fa-check', {className: 'Button-icon'}) : ''} {this.attrs.active ? icon('fas fa-check', { className: 'Button-icon' }) : ''}
<span className="SubscriptionMenuItem-label"> <span className="SubscriptionMenuItem-label">
{icon(this.attrs.icon, {className: 'Button-icon'})} {icon(this.attrs.icon, { className: 'Button-icon' })}
<strong>{this.attrs.label}</strong> <strong>{this.attrs.label}</strong>
<span className="SubscriptionMenuItem-description">{this.attrs.description}</span> <span className="SubscriptionMenuItem-description">{this.attrs.description}</span>
</span> </span>

4
extensions/subscriptions/js/src/forum/index.js
View File

@@ -23,11 +23,11 @@ app.initializers.add('subscriptions', function () {
addSubscriptionFilter(); addSubscriptionFilter();
addSubscriptionSettings(); addSubscriptionSettings();
extend(NotificationGrid.prototype, 'notificationTypes', function(items) { extend(NotificationGrid.prototype, 'notificationTypes', function (items) {
items.add('newPost', { items.add('newPost', {
name: 'newPost', name: 'newPost',
icon: 'fas fa-star', icon: 'fas fa-star',
label: app.translator.trans('flarum-subscriptions.forum.settings.notify_new_post_label') label: app.translator.trans('flarum-subscriptions.forum.settings.notify_new_post_label'),
}); });
}); });
}); });