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

fix(mentions): cannot use mentionables extender (#3849)

Browse Source
This commit is contained in:
Sami Mazouz
2023-07-01 17:47:33 +01:00
parent 2bc2899a1d
commit d2a6329689
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/mentions/js/src/forum/addComposerAutocomplete.js
View File

@@ -5,12 +5,9 @@ import TextEditorButton from 'flarum/common/components/TextEditorButton';
import KeyboardNavigatable from 'flarum/common/utils/KeyboardNavigatable'; import KeyboardNavigatable from 'flarum/common/utils/KeyboardNavigatable';
import AutocompleteDropdown from './fragments/AutocompleteDropdown'; import AutocompleteDropdown from './fragments/AutocompleteDropdown';
import MentionFormats from './mentionables/formats/MentionFormats';
import MentionableModels from './mentionables/MentionableModels'; import MentionableModels from './mentionables/MentionableModels';
export default function addComposerAutocomplete() { export default function addComposerAutocomplete() {
app.mentionFormats = new MentionFormats();
const $container = $('<div class="ComposerBody-mentionsDropdownContainer"></div>'); const $container = $('<div class="ComposerBody-mentionsDropdownContainer"></div>');
const dropdown = new AutocompleteDropdown(); const dropdown = new AutocompleteDropdown();

4
extensions/mentions/js/src/forum/extenders/Mentionables.ts
View File

@@ -5,7 +5,7 @@ import type MentionFormat from '../mentionables/formats/MentionFormat';
export default class Mentionables implements IExtender<ForumApplication> { export default class Mentionables implements IExtender<ForumApplication> {
protected formats: (new () => MentionFormat)[] = []; protected formats: (new () => MentionFormat)[] = [];
protected mentionables: Record<string, (new () => MentionableModel)[]> = {}; protected mentionables: Record<string, (new (...args: any[]) => MentionableModel)[]> = {};
/** /**
* Register a new mention format. * Register a new mention format.
@@ -26,7 +26,7 @@ export default class Mentionables implements IExtender<ForumApplication> {
* @param mentionable The mentionable instance to register. * @param mentionable The mentionable instance to register.
* Must extend MentionableModel. * Must extend MentionableModel.
*/ */
mentionable(symbol: string, mentionable: new () => MentionableModel): this { mentionable(symbol: string, mentionable: new (...args: any[]) => MentionableModel): this {
if (!this.mentionables[symbol]) { if (!this.mentionables[symbol]) {
this.mentionables[symbol] = []; this.mentionables[symbol] = [];
} }

3
extensions/mentions/js/src/forum/index.js
View File

@@ -13,11 +13,14 @@ import addComposerAutocomplete from './addComposerAutocomplete';
import PostMentionedNotification from './components/PostMentionedNotification'; import PostMentionedNotification from './components/PostMentionedNotification';
import UserMentionedNotification from './components/UserMentionedNotification'; import UserMentionedNotification from './components/UserMentionedNotification';
import GroupMentionedNotification from './components/GroupMentionedNotification'; import GroupMentionedNotification from './components/GroupMentionedNotification';
import MentionFormats from './mentionables/formats/MentionFormats';
import UserPage from 'flarum/forum/components/UserPage'; import UserPage from 'flarum/forum/components/UserPage';
import LinkButton from 'flarum/common/components/LinkButton'; import LinkButton from 'flarum/common/components/LinkButton';
import User from 'flarum/common/models/User'; import User from 'flarum/common/models/User';
import Model from 'flarum/common/Model'; import Model from 'flarum/common/Model';
app.mentionFormats = new MentionFormats();
export { default as extend } from './extend'; export { default as extend } from './extend';
app.initializers.add('flarum-mentions', function () { app.initializers.add('flarum-mentions', function () {

2
extensions/mentions/js/src/forum/mentionables/formats/HashMentionFormat.ts
View File

@@ -4,7 +4,7 @@ import TagMention from '../TagMention';
export default class HashMentionFormat extends MentionFormat { export default class HashMentionFormat extends MentionFormat {
public mentionables: (new (...args: any[]) => MentionableModel)[] = [TagMention]; public mentionables: (new (...args: any[]) => MentionableModel)[] = [TagMention];
protected extendable: boolean = false; protected extendable: boolean = true;
public trigger(): string { public trigger(): string {
return '#'; return '#';