Required updates after rebase

mattermost · May 26, 2016 · 2f1b124 · 2f1b124
1 parent 9773997
commit 2f1b124
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/webapp/components/pending_post_actions.jsx → ..._view/components/pending_post_options.jsx b/webapp/components/pending_post_actions.jsx → ..._view/components/pending_post_options.jsx
@@ -4,7 +4,7 @@
 import PostStore from 'stores/post_store.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 
-import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
 
 import Client from 'utils/web_client.jsx';
 import * as AsyncClient from 'utils/async_client.jsx';
@@ -16,7 +16,7 @@ import {FormattedMessage} from 'react-intl';
 
 import React from 'react';
 
-export default class PendingPostActions extends React.Component {
+export default class PendingPostOptions extends React.Component {
     constructor(props) {
         super(props);
         this.retryPost = this.retryPost.bind(this);
@@ -87,6 +87,6 @@ export default class PendingPostActions extends React.Component {
     }
 }
 
-PendingPostActions.propTypes = {
+PendingPostOptions.propTypes = {
     post: React.PropTypes.object
 };
diff --git a/webapp/components/post_view/components/post_body.jsx b/webapp/components/post_view/components/post_body.jsx
@@ -7,7 +7,7 @@ import * as Utils from 'utils/utils.jsx';
 import Constants from 'utils/constants.jsx';
 import * as TextFormatting from 'utils/text_formatting.jsx';
 import PostBodyAdditionalContent from './post_body_additional_content.jsx';
-import PendingPostActions from './pending_post_actions.jsx';
+import PendingPostOptions from './pending_post_options.jsx';
 
 import {FormattedMessage} from 'react-intl';
 
@@ -111,7 +111,7 @@ export default class PostBody extends React.Component {
         let loading;
         if (post.state === Constants.POST_FAILED) {
             postClass += ' post--fail';
-            loading = <PendingPostActions post={this.props.post}/>;
+            loading = <PendingPostOptions post={this.props.post}/>;
         } else if (post.state === Constants.POST_LOADING) {
             postClass += ' post-waiting';
             loading = (

diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
@@ -3,7 +3,7 @@
 
 import UserProfile from './user_profile.jsx';
 import FileAttachmentList from './file_attachment_list.jsx';
-import PendingPostActions from './pending_post_actions.jsx';
+import PendingPostOptions from 'components/post_view/components/pending_post_options.jsx';
 
 import TeamStore from 'stores/team_store.jsx';
 import UserStore from 'stores/user_store.jsx';
@@ -163,7 +163,7 @@ export default class RhsComment extends React.Component {
 
         if (post.state === Constants.POST_FAILED) {
             postClass += ' post-fail';
-            loading = <PendingPostActions post={this.props.post}/>;
+            loading = <PendingPostOptions post={this.props.post}/>;
         } else if (post.state === Constants.POST_LOADING) {
             postClass += ' post-waiting';
             loading = (