diff --git a/extensions/mentions/js/src/admin/index.js b/extensions/mentions/js/src/admin/index.js index 069ae009d..900b2b68a 100644 --- a/extensions/mentions/js/src/admin/index.js +++ b/extensions/mentions/js/src/admin/index.js @@ -1,10 +1,8 @@ -app.initializers.add('flarum-mentions', function() { - app.extensionData - .for('flarum-mentions') - .registerSetting({ - setting: 'flarum-mentions.allow_username_format', - type: 'boolean', - label: app.translator.trans('flarum-mentions.admin.settings.allow_username_format_label'), - help: app.translator.trans('flarum-mentions.admin.settings.allow_username_format_text') - }); +app.initializers.add('flarum-mentions', function () { + app.extensionData.for('flarum-mentions').registerSetting({ + setting: 'flarum-mentions.allow_username_format', + type: 'boolean', + label: app.translator.trans('flarum-mentions.admin.settings.allow_username_format_label'), + help: app.translator.trans('flarum-mentions.admin.settings.allow_username_format_text'), + }); }); diff --git a/extensions/mentions/js/src/forum/addComposerAutocomplete.js b/extensions/mentions/js/src/forum/addComposerAutocomplete.js index 0428f843d..916c69f10 100644 --- a/extensions/mentions/js/src/forum/addComposerAutocomplete.js +++ b/extensions/mentions/js/src/forum/addComposerAutocomplete.js @@ -25,7 +25,7 @@ const throttledSearch = throttle( returnedUsers.push(u); } }); - + buildSuggestions(); }); searched.push(typedLower); diff --git a/extensions/mentions/js/src/forum/addPostQuoteButton.js b/extensions/mentions/js/src/forum/addPostQuoteButton.js index 504a6674f..b3cd60620 100644 --- a/extensions/mentions/js/src/forum/addPostQuoteButton.js +++ b/extensions/mentions/js/src/forum/addPostQuoteButton.js @@ -5,7 +5,7 @@ import PostQuoteButton from './fragments/PostQuoteButton'; import selectedText from './utils/selectedText'; export default function addPostQuoteButton() { - extend(CommentPost.prototype, 'oncreate', function() { + extend(CommentPost.prototype, 'oncreate', function () { const post = this.attrs.post; if (post.isHidden() || (app.session.user && !post.discussion().canReply())) return; @@ -18,7 +18,7 @@ export default function addPostQuoteButton() { const button = new PostQuoteButton(post); - const handler = function(e) { + const handler = function (e) { setTimeout(() => { const content = selectedText($postBody); if (content) { diff --git a/extensions/mentions/js/src/forum/addPostReplyAction.js b/extensions/mentions/js/src/forum/addPostReplyAction.js index 6d1db4be8..d676026b4 100644 --- a/extensions/mentions/js/src/forum/addPostReplyAction.js +++ b/extensions/mentions/js/src/forum/addPostReplyAction.js @@ -6,13 +6,13 @@ import reply from './utils/reply'; export default function () { extend(CommentPost.prototype, 'actionItems', function (items) { - const post = this.attrs.post; if (post.isHidden() || (app.session.user && !post.discussion().canReply())) return; - items.add('reply', - ); diff --git a/extensions/mentions/js/src/forum/compat.js b/extensions/mentions/js/src/forum/compat.js index 6167d98f2..7ada97757 100644 --- a/extensions/mentions/js/src/forum/compat.js +++ b/extensions/mentions/js/src/forum/compat.js @@ -19,5 +19,5 @@ export default { 'mentions/utils/getMentionText': getMentionText, 'mentions/utils/reply': reply, 'mentions/utils/selectedText': selectedText, - 'mentions/utils/textFormatter': textFormatter -}; \ No newline at end of file + 'mentions/utils/textFormatter': textFormatter, +}; diff --git a/extensions/mentions/js/src/forum/components/MentionsUserPage.js b/extensions/mentions/js/src/forum/components/MentionsUserPage.js index 6d07f2628..183d3d4d0 100644 --- a/extensions/mentions/js/src/forum/components/MentionsUserPage.js +++ b/extensions/mentions/js/src/forum/components/MentionsUserPage.js @@ -15,10 +15,10 @@ export default class MentionsUserPage extends PostsUserPage { return app.store.find('posts', { filter: { type: 'comment', - mentioned: this.user.id() + mentioned: this.user.id(), }, - page: {offset, limit: this.loadLimit}, - sort: '-createdAt' + page: { offset, limit: this.loadLimit }, + sort: '-createdAt', }); } } diff --git a/extensions/mentions/js/src/forum/components/PostMentionedNotification.js b/extensions/mentions/js/src/forum/components/PostMentionedNotification.js index ee99946ea..d26cddf1e 100644 --- a/extensions/mentions/js/src/forum/components/PostMentionedNotification.js +++ b/extensions/mentions/js/src/forum/components/PostMentionedNotification.js @@ -18,7 +18,7 @@ export default class PostMentionedNotification extends Notification { const notification = this.attrs.notification; const user = notification.fromUser(); - return app.translator.trans('flarum-mentions.forum.notifications.post_mentioned_text', {user, count: 1}); + return app.translator.trans('flarum-mentions.forum.notifications.post_mentioned_text', { user, count: 1 }); } excerpt() { diff --git a/extensions/mentions/js/src/forum/components/UserMentionedNotification.js b/extensions/mentions/js/src/forum/components/UserMentionedNotification.js index ab5e72cdc..7c9b02545 100644 --- a/extensions/mentions/js/src/forum/components/UserMentionedNotification.js +++ b/extensions/mentions/js/src/forum/components/UserMentionedNotification.js @@ -15,7 +15,7 @@ export default class UserMentionedNotification extends Notification { content() { const user = this.attrs.notification.fromUser(); - return app.translator.trans('flarum-mentions.forum.notifications.user_mentioned_text', {user}); + return app.translator.trans('flarum-mentions.forum.notifications.user_mentioned_text', { user }); } excerpt() { diff --git a/extensions/mentions/js/src/forum/fragments/AutocompleteDropdown.js b/extensions/mentions/js/src/forum/fragments/AutocompleteDropdown.js index badefebf3..6428929e9 100644 --- a/extensions/mentions/js/src/forum/fragments/AutocompleteDropdown.js +++ b/extensions/mentions/js/src/forum/fragments/AutocompleteDropdown.js @@ -9,16 +9,20 @@ export default class AutocompleteDropdown extends Fragment { view() { return ( ); } show(left, top) { - this.$().show().css({ - left: left + 'px', - top: top + 'px' - }); + this.$() + .show() + .css({ + left: left + 'px', + top: top + 'px', + }); this.active = true; } @@ -31,7 +35,7 @@ export default class AutocompleteDropdown extends Fragment { this.keyWasJustPressed = true; this.setIndex(this.index + delta, true); clearTimeout(this.keyWasJustPressedTimeout); - this.keyWasJustPressedTimeout = setTimeout(() => this.keyWasJustPressed = false, 500); + this.keyWasJustPressedTimeout = setTimeout(() => (this.keyWasJustPressed = false), 500); } complete() { diff --git a/extensions/mentions/js/src/forum/fragments/PostQuoteButton.js b/extensions/mentions/js/src/forum/fragments/PostQuoteButton.js index 39a564246..5771471d5 100644 --- a/extensions/mentions/js/src/forum/fragments/PostQuoteButton.js +++ b/extensions/mentions/js/src/forum/fragments/PostQuoteButton.js @@ -12,9 +12,12 @@ export default class PostQuoteButton extends Fragment { view() { return ( - @@ -25,10 +28,7 @@ export default class PostQuoteButton extends Fragment { const $this = this.$().show(); const parentOffset = $this.offsetParent().offset(); - $this - .css('left', left - parentOffset.left) - .css('top', top - parentOffset.top); - + $this.css('left', left - parentOffset.left).css('top', top - parentOffset.top); this.hideHandler = this.hide.bind(this); $(document).on('mouseup', this.hideHandler); diff --git a/extensions/mentions/js/src/forum/index.js b/extensions/mentions/js/src/forum/index.js index 7a0629fc5..fce3a9261 100644 --- a/extensions/mentions/js/src/forum/index.js +++ b/extensions/mentions/js/src/forum/index.js @@ -10,11 +10,11 @@ import addPostQuoteButton from './addPostQuoteButton'; import addComposerAutocomplete from './addComposerAutocomplete'; import PostMentionedNotification from './components/PostMentionedNotification'; import UserMentionedNotification from './components/UserMentionedNotification'; -import UserPage from 'flarum/components/UserPage' +import UserPage from 'flarum/components/UserPage'; import LinkButton from 'flarum/components/LinkButton'; import MentionsUserPage from './components/MentionsUserPage'; -app.initializers.add('flarum-mentions', function() { +app.initializers.add('flarum-mentions', function () { // For every mention of a post inside a post's content, set up a hover handler // that shows a preview of the mentioned post. addPostMentionPreviews(); @@ -38,30 +38,34 @@ app.initializers.add('flarum-mentions', function() { app.notificationComponents.userMentioned = UserMentionedNotification; // Add notification preferences. - extend(NotificationGrid.prototype, 'notificationTypes', function(items) { + extend(NotificationGrid.prototype, 'notificationTypes', function (items) { items.add('postMentioned', { name: 'postMentioned', icon: 'fas fa-reply', - label: app.translator.trans('flarum-mentions.forum.settings.notify_post_mentioned_label') + label: app.translator.trans('flarum-mentions.forum.settings.notify_post_mentioned_label'), }); items.add('userMentioned', { name: 'userMentioned', icon: 'fas fa-at', - label: app.translator.trans('flarum-mentions.forum.settings.notify_user_mentioned_label') + label: app.translator.trans('flarum-mentions.forum.settings.notify_user_mentioned_label'), }); }); // Add mentions tab in user profile - app.routes['user.mentions'] = {path: '/u/:username/mentions', component: MentionsUserPage}; - extend(UserPage.prototype, 'navItems', function(items) { + app.routes['user.mentions'] = { path: '/u/:username/mentions', component: MentionsUserPage }; + extend(UserPage.prototype, 'navItems', function (items) { const user = this.user; - items.add('mentions', - LinkButton.component({ - href: app.route('user.mentions', {username: user.slug()}), - name: 'mentions', - icon: 'fas fa-at' - }, app.translator.trans('flarum-mentions.forum.user.mentions_link')), + items.add( + 'mentions', + LinkButton.component( + { + href: app.route('user.mentions', { username: user.slug() }), + name: 'mentions', + icon: 'fas fa-at', + }, + app.translator.trans('flarum-mentions.forum.user.mentions_link') + ), 80 ); }); diff --git a/extensions/mentions/js/src/forum/utils/textFormatter.js b/extensions/mentions/js/src/forum/utils/textFormatter.js index f1aa9aef5..f888a8f39 100644 --- a/extensions/mentions/js/src/forum/utils/textFormatter.js +++ b/extensions/mentions/js/src/forum/utils/textFormatter.js @@ -6,8 +6,7 @@ export function filterUserMentions(tag) { if (app.forum.attribute('allowUsernameMentionFormat') && tag.hasAttribute('username')) user = app.store.getBy('users', 'username', tag.getAttribute('username')); - else if (tag.hasAttribute('id')) - user = app.store.getById('users', tag.getAttribute('id')); + else if (tag.hasAttribute('id')) user = app.store.getById('users', tag.getAttribute('id')); if (user) { tag.setAttribute('id', user.id());