github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-01 02:23:00 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

chore: simplify checking of current composer

Browse Source
This commit is contained in:
Sami Mazouz 2024-10-25 14:48:16 +01:00
parent 6e5180dcfe
commit 53ac644516
No known key found for this signature in database
5 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/mentions/js/src/forum/mentionables/PostMention.tsx
View File

@ -21,10 +21,7 @@ export default class PostMention extends MentionableModel<Post, AtMentionFormat>
* match any username characters that have been typed.
*/
initialResults(): Post[] {
const EditPostComposer = flarum.reg.checkModule('core', 'forum/components/EditPostComposer');
const ReplyComposer = flarum.reg.checkModule('core', 'forum/components/ReplyComposer');
if ((!ReplyComposer || !app.composer.bodyMatches(ReplyComposer)) && (!EditPostComposer || !app.composer.bodyMatches(EditPostComposer))) {
if (!app.composer.bodyMatches('flarum/forum/components/ReplyComposer') && !app.composer.bodyMatches('flarum/forum/components/EditPostComposer')) {
return [];
}

4
extensions/mentions/js/src/forum/utils/reply.js
View File

@ -26,9 +26,7 @@ export function insertMention(post, composer, quote) {
}
export default function reply(post, quote) {
const EditPostComposer = flarum.reg.checkModule('core', 'forum/components/EditPostComposer');
if (EditPostComposer && app.composer.bodyMatches(EditPostComposer) && app.composer.body.attrs.post.discussion() === post.discussion()) {
if (app.composer.bodyMatches('flarum/forum/components/EditPostComposer') && app.composer.body.attrs.post.discussion() === post.discussion()) {
// If we're already editing a post in the discussion of post we're quoting,
// insert the mention directly.
return insertMention(post, app.composer, quote);

6
extensions/messages/js/src/forum/index.tsx
View File

@ -24,11 +24,7 @@ app.initializers.add('flarum-messages', () => {
);
app.composer.composingMessageTo = function (dialog: Dialog) {
const MessageComposer = flarum.reg.checkModule('flarum-messages', 'forum/components/MessageComposer');
if (!MessageComposer) return false;
return this.isVisible() && this.bodyMatches(MessageComposer, { dialog });
return this.isVisible() && this.bodyMatches('flarum/messages/forum/components/MessageComposer', { dialog });
};
extend(IndexSidebar.prototype, 'navItems', function (items) {

6
framework/core/js/src/forum/components/CommentPost.js
View File

@ -107,11 +107,7 @@ export default class CommentPost extends Post {
}
isEditing() {
const EditPostComposer = flarum.reg.checkModule('core', 'forum/components/EditPostComposer');
if (!EditPostComposer) return false;
return app.composer.bodyMatches(EditPostComposer, { post: this.attrs.post });
return app.composer.bodyMatches('flarum/forum/components/EditPostComposer', { post: this.attrs.post });
}
elementAttrs() {

16
framework/core/js/src/forum/states/ComposerState.tsx
View File

@ -171,7 +171,15 @@ class ComposerState {
* @param type The component class to check against. Subclasses are accepted as well.
* @param data
*/
bodyMatches(type: object, data: any = {}): boolean {
bodyMatches(type: object | string, data: any = {}): boolean {
if (typeof type === 'string') {
const [namespace, id] = flarum.reg.namespaceAndIdFromPath(type);
type = flarum.reg.checkModule(namespace, id);
if (!type) return false;
}
// Fail early when the body is of a different type
if (!subclassOf(this.body.componentClass, type)) return false;
@ -212,11 +220,7 @@ class ComposerState {
* @return {boolean}
*/
composingReplyTo(discussion: Discussion) {
const ReplyComposer = flarum.reg.checkModule('core', 'forum/components/ReplyComposer');
if (!ReplyComposer) return false;
return this.isVisible() && this.bodyMatches(ReplyComposer, { discussion });
return this.isVisible() && this.bodyMatches('flarum/forum/components/ReplyComposer', { discussion });
}
/**