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

This commit is contained in:
Toby Zerner 2015-05-18 18:50:50 +09:30
parent c99055c6a3
commit 736824d45c
4 changed files with 15 additions and 15 deletions

View File

@ -8,9 +8,9 @@ import DiscussionHero from 'flarum/components/discussion-hero';
import Separator from 'flarum/components/separator'; import Separator from 'flarum/components/separator';
import ActionButton from 'flarum/components/action-button'; import ActionButton from 'flarum/components/action-button';
import NavItem from 'flarum/components/nav-item'; import NavItem from 'flarum/components/nav-item';
import ComposerDiscussion from 'flarum/components/composer-discussion'; import DiscussionComposer from 'flarum/components/discussion-composer';
import SettingsPage from 'flarum/components/settings-page'; import SettingsPage from 'flarum/components/settings-page';
import ActivityPost from 'flarum/components/activity-post'; import PostActivity from 'flarum/components/post-activity';
import icon from 'flarum/helpers/icon'; import icon from 'flarum/helpers/icon';
import app from 'flarum/app'; import app from 'flarum/app';
@ -19,8 +19,8 @@ import CategoriesPage from 'categories/components/categories-page';
import CategoryHero from 'categories/components/category-hero'; import CategoryHero from 'categories/components/category-hero';
import CategoryNavItem from 'categories/components/category-nav-item'; import CategoryNavItem from 'categories/components/category-nav-item';
import MoveDiscussionModal from 'categories/components/move-discussion-modal'; import MoveDiscussionModal from 'categories/components/move-discussion-modal';
import NotificationDiscussionMoved from 'categories/components/notification-discussion-moved'; import DiscussionMovedNotification from 'categories/components/discussion-moved-notification';
import PostDiscussionMoved from 'categories/components/post-discussion-moved'; import DiscussionMovedPost from 'categories/components/discussion-moved-post';
import categoryLabel from 'categories/helpers/category-label'; import categoryLabel from 'categories/helpers/category-label';
import categoryIcon from 'categories/helpers/category-icon'; import categoryIcon from 'categories/helpers/category-icon';
@ -38,8 +38,8 @@ app.initializers.add('categories', function() {
Discussion.prototype.canMove = Model.prop('canMove'); Discussion.prototype.canMove = Model.prop('canMove');
// Register components. // Register components.
app.postComponentRegistry['discussionMoved'] = PostDiscussionMoved; app.postComponentRegistry['discussionMoved'] = DiscussionMovedPost;
app.notificationComponentRegistry['discussionMoved'] = NotificationDiscussionMoved; app.notificationComponentRegistry['discussionMoved'] = DiscussionMovedNotification;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// INDEX PAGE // INDEX PAGE
@ -182,8 +182,8 @@ app.initializers.add('categories', function() {
}); });
// Add category-selection abilities to the discussion composer. // Add category-selection abilities to the discussion composer.
ComposerDiscussion.prototype.category = m.prop(); DiscussionComposer.prototype.category = m.prop();
ComposerDiscussion.prototype.chooseCategory = function() { DiscussionComposer.prototype.chooseCategory = function() {
var modal = new MoveDiscussionModal({ var modal = new MoveDiscussionModal({
onchange: category => { onchange: category => {
this.category(category); this.category(category);
@ -195,7 +195,7 @@ app.initializers.add('categories', function() {
// Add a category-selection menu to the discussion composer's header, after // Add a category-selection menu to the discussion composer's header, after
// the title. // the title.
extend(ComposerDiscussion.prototype, 'headerItems', function(items) { extend(DiscussionComposer.prototype, 'headerItems', function(items) {
var category = this.category(); var category = this.category();
items.add('category', m('a[href=javascript:;][tabindex=-1].btn.btn-link.control-change-category', {onclick: this.chooseCategory.bind(this)}, [ items.add('category', m('a[href=javascript:;][tabindex=-1].btn.btn-link.control-change-category', {onclick: this.chooseCategory.bind(this)}, [
@ -206,7 +206,7 @@ app.initializers.add('categories', function() {
}); });
// Add the selected category as data to submit to the server. // Add the selected category as data to submit to the server.
extend(ComposerDiscussion.prototype, 'data', function(data) { extend(DiscussionComposer.prototype, 'data', function(data) {
data.links = data.links || {}; data.links = data.links || {};
data.links.category = this.category(); data.links.category = this.category();
}); });
@ -216,7 +216,7 @@ app.initializers.add('categories', function() {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Add a category label next to the discussion title in post activity items. // Add a category label next to the discussion title in post activity items.
extend(ActivityPost.prototype, 'headerItems', function(items) { extend(PostActivity.prototype, 'headerItems', function(items) {
var category = this.props.activity.post().discussion().category(); var category = this.props.activity.post().discussion().category();
if (category) { if (category) {
items.add('category', categoryLabel(category)); items.add('category', categoryLabel(category));

View File

@ -2,7 +2,7 @@ import Notification from 'flarum/components/notification';
import username from 'flarum/helpers/username'; import username from 'flarum/helpers/username';
import categoryLabel from 'categories/helpers/category-label'; import categoryLabel from 'categories/helpers/category-label';
export default class NotificationDiscussionMoved extends Notification { export default class DiscussionMovedNotification extends Notification {
view() { view() {
var notification = this.props.notification; var notification = this.props.notification;
var discussion = notification.subject(); var discussion = notification.subject();

View File

@ -1,7 +1,7 @@
import PostActivity from 'flarum/components/post-activity'; import EventPost from 'flarum/components/event-post';
import categoryLabel from 'categories/helpers/category-label'; import categoryLabel from 'categories/helpers/category-label';
export default class PostDiscussionMoved extends PostActivity { export default class DiscussionMovedPost extends EventPost {
view() { view() {
var post = this.props.post; var post = this.props.post;
var oldCategory = app.store.getById('categories', post.content()[0]); var oldCategory = app.store.getById('categories', post.content()[0]);

View File

@ -23,7 +23,7 @@
padding: 2px 6px; padding: 2px 6px;
} }
.post-discussion-moved & { .discussion-moved-post & {
margin: 0 2px; margin: 0 2px;
} }
} }