mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 15:34:26 +02:00
Code Issues Releases Wiki Activity

Rename JS sub-components so that descriptors are before the noun, not after

Browse Source 
To be consistent with the naming in PHP world.

e.g. ReplyComposer instead of ComposerReply
This commit is contained in:
Toby Zerner
2015-05-18 18:50:24 +09:30
parent 8e24e7197e
commit 9135749bb4
17 changed files with 40 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/forum/src/initializers/components.js
View File

@@ -1,21 +1,21 @@
import PostComment from 'flarum/components/post-comment';
import PostDiscussionRenamed from 'flarum/components/post-discussion-renamed';
import ActivityPost from 'flarum/components/activity-post';
import ActivityJoin from 'flarum/components/activity-join';
import NotificationDiscussionRenamed from 'flarum/components/notification-discussion-renamed';
import CommentPost from 'flarum/components/comment-post';
import DiscussionRenamedPost from 'flarum/components/discussion-renamed-post';
import PostActivity from 'flarum/components/post-activity';
import JoinActivity from 'flarum/components/join-activity';
import DiscussionRenamedNotification from 'flarum/components/discussion-renamed-notification';
export default function(app) {
app.postComponentRegistry = {
comment: PostComment,
discussionRenamed: PostDiscussionRenamed
comment: CommentPost,
discussionRenamed: DiscussionRenamedPost
};
app.activityComponentRegistry = {
post: ActivityPost,
join: ActivityJoin
post: PostActivity,
join: JoinActivity
};
app.notificationComponentRegistry = {
discussionRenamed: NotificationDiscussionRenamed
discussionRenamed: DiscussionRenamedNotification
};
}

6
js/forum/src/initializers/discussion-controls.js
View File

@@ -1,6 +1,6 @@
import Discussion from 'flarum/models/discussion';
import DiscussionPage from 'flarum/components/discussion-page';
import ComposerReply from 'flarum/components/composer-reply';
import ReplyComposer from 'flarum/components/reply-composer';
import LoginModal from 'flarum/components/login-modal';
import ActionButton from 'flarum/components/action-button';
import Separator from 'flarum/components/separator';
@@ -13,8 +13,8 @@ export default function(app) {
app.current.streamContent.goToLast();
}
var component = app.composer.component;
if (!(component instanceof ComposerReply) || component.props.discussion !== this || component.props.user !== app.session.user() || forceRefresh) {
component = new ComposerReply({
if (!(component instanceof ReplyComposer) || component.props.discussion !== this || component.props.user !== app.session.user() || forceRefresh) {
component = new ReplyComposer({
user: app.session.user(),
discussion: this
});

4
js/forum/src/initializers/post-controls.js
View File

@@ -1,13 +1,13 @@
import Post from 'flarum/models/post';
import DiscussionPage from 'flarum/components/discussion-page';
import ComposerEdit from 'flarum/components/composer-edit';
import EditComposer from 'flarum/components/edit-composer';
import ActionButton from 'flarum/components/action-button';
import Separator from 'flarum/components/separator';
import ItemList from 'flarum/utils/item-list';
export default function(app) {
function editAction() {
app.composer.load(new ComposerEdit({ post: this }));
app.composer.load(new EditComposer({ post: this }));
app.composer.show();
}