Merge pull request #2101 from hmhealey/plt1415
PLT-1415 Renamed RECIEVED_* to RECEIVED_*
Этот коммит содержится в:
@@ -114,7 +114,7 @@ export default class ChannelHeader extends React.Component {
|
||||
}
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH_TERM,
|
||||
type: ActionTypes.RECEIVED_SEARCH_TERM,
|
||||
term: terms,
|
||||
do_search: true,
|
||||
is_mention_search: true
|
||||
|
||||
@@ -152,7 +152,7 @@ class CreateComment extends React.Component {
|
||||
ChannelStore.setChannelMember(member);
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST,
|
||||
type: ActionTypes.RECEIVED_POST,
|
||||
post: data
|
||||
});
|
||||
}.bind(this),
|
||||
@@ -216,7 +216,7 @@ class CreateComment extends React.Component {
|
||||
}
|
||||
|
||||
AppDispatcher.handleViewAction({
|
||||
type: ActionTypes.RECIEVED_EDIT_POST,
|
||||
type: ActionTypes.RECEIVED_EDIT_POST,
|
||||
refocusId: '#reply_textbox',
|
||||
title: this.props.intl.formatMessage(holders.commentTitle),
|
||||
message: lastPost.message,
|
||||
|
||||
@@ -364,7 +364,7 @@ class CreatePost extends React.Component {
|
||||
var type = (lastPost.root_id && lastPost.root_id.length > 0) ? formatMessage(holders.comment) : formatMessage(holders.post);
|
||||
|
||||
AppDispatcher.handleViewAction({
|
||||
type: ActionTypes.RECIEVED_EDIT_POST,
|
||||
type: ActionTypes.RECEIVED_EDIT_POST,
|
||||
refocusId: '#post_textbox',
|
||||
title: type,
|
||||
message: lastPost.message,
|
||||
|
||||
@@ -62,12 +62,12 @@ export default class DeletePostModal extends React.Component {
|
||||
var selectedPost = selectedList.posts[selectedList.order[0]];
|
||||
if ((selectedPost.id === this.state.post.id && !this.state.root_id) || selectedPost.root_id === this.state.post.id) {
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH,
|
||||
type: ActionTypes.RECEIVED_SEARCH,
|
||||
results: null
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST_SELECTED,
|
||||
type: ActionTypes.RECEIVED_POST_SELECTED,
|
||||
results: null
|
||||
});
|
||||
} else if (selectedPost.id === this.state.post.id && this.state.root_id) {
|
||||
@@ -76,12 +76,12 @@ export default class DeletePostModal extends React.Component {
|
||||
delete selectedList.posts[selectedPost.id];
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST_SELECTED,
|
||||
type: ActionTypes.RECEIVED_POST_SELECTED,
|
||||
post_list: selectedList
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH,
|
||||
type: ActionTypes.RECEIVED_SEARCH,
|
||||
results: null
|
||||
});
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ class EditChannelHeaderModal extends React.Component {
|
||||
this.onHide();
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: Constants.ActionTypes.RECIEVED_CHANNEL,
|
||||
type: Constants.ActionTypes.RECEIVED_CHANNEL,
|
||||
channel
|
||||
});
|
||||
},
|
||||
|
||||
@@ -82,12 +82,12 @@ export default class Navbar extends React.Component {
|
||||
var windowWidth = $(window).outerWidth();
|
||||
if (windowWidth <= 768) {
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH,
|
||||
type: ActionTypes.RECEIVED_SEARCH,
|
||||
results: null
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST_SELECTED,
|
||||
type: ActionTypes.RECEIVED_POST_SELECTED,
|
||||
results: null
|
||||
});
|
||||
|
||||
|
||||
@@ -31,12 +31,12 @@ export default class Post extends React.Component {
|
||||
data.posts = this.props.posts;
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST_SELECTED,
|
||||
type: ActionTypes.RECEIVED_POST_SELECTED,
|
||||
post_list: data
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH,
|
||||
type: ActionTypes.RECEIVED_SEARCH,
|
||||
results: null
|
||||
});
|
||||
}
|
||||
@@ -59,7 +59,7 @@ export default class Post extends React.Component {
|
||||
ChannelStore.setChannelMember(member);
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST,
|
||||
type: ActionTypes.RECEIVED_POST,
|
||||
post: data
|
||||
});
|
||||
},
|
||||
|
||||
@@ -24,19 +24,19 @@ export default class PostDeletedModal extends React.Component {
|
||||
}
|
||||
handleClose() {
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH,
|
||||
type: ActionTypes.RECEIVED_SEARCH,
|
||||
results: null
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH_TERM,
|
||||
type: ActionTypes.RECEIVED_SEARCH_TERM,
|
||||
term: null,
|
||||
do_search: false,
|
||||
is_mention_search: false
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST_SELECTED,
|
||||
type: ActionTypes.RECEIVED_POST_SELECTED,
|
||||
results: null
|
||||
});
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ class RhsComment extends React.Component {
|
||||
ChannelStore.setChannelMember(member);
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST,
|
||||
type: ActionTypes.RECEIVED_POST,
|
||||
post: data
|
||||
});
|
||||
},
|
||||
@@ -267,4 +267,4 @@ RhsComment.propTypes = {
|
||||
post: React.PropTypes.object
|
||||
};
|
||||
|
||||
export default injectIntl(RhsComment);
|
||||
export default injectIntl(RhsComment);
|
||||
|
||||
@@ -21,12 +21,12 @@ export default class RhsHeaderPost extends React.Component {
|
||||
e.preventDefault();
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH,
|
||||
type: ActionTypes.RECEIVED_SEARCH,
|
||||
results: null
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST_SELECTED,
|
||||
type: ActionTypes.RECEIVED_POST_SELECTED,
|
||||
results: null
|
||||
});
|
||||
}
|
||||
@@ -34,14 +34,14 @@ export default class RhsHeaderPost extends React.Component {
|
||||
e.preventDefault();
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH_TERM,
|
||||
type: ActionTypes.RECEIVED_SEARCH_TERM,
|
||||
term: this.props.fromSearch,
|
||||
do_search: true,
|
||||
is_mention_search: this.props.isMentionSearch
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST_SELECTED,
|
||||
type: ActionTypes.RECEIVED_POST_SELECTED,
|
||||
results: null
|
||||
});
|
||||
}
|
||||
|
||||
@@ -74,19 +74,19 @@ class SearchBar extends React.Component {
|
||||
e.preventDefault();
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH,
|
||||
type: ActionTypes.RECEIVED_SEARCH,
|
||||
results: null
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH_TERM,
|
||||
type: ActionTypes.RECEIVED_SEARCH_TERM,
|
||||
term: null,
|
||||
do_search: false,
|
||||
is_mention_search: false
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST_SELECTED,
|
||||
type: ActionTypes.RECEIVED_POST_SELECTED,
|
||||
results: null
|
||||
});
|
||||
}
|
||||
@@ -117,7 +117,7 @@ class SearchBar extends React.Component {
|
||||
}
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH,
|
||||
type: ActionTypes.RECEIVED_SEARCH,
|
||||
results: data,
|
||||
is_mention_search: isMentionSearch
|
||||
});
|
||||
|
||||
@@ -19,19 +19,19 @@ export default class SearchResultsHeader extends React.Component {
|
||||
e.preventDefault();
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH,
|
||||
type: ActionTypes.RECEIVED_SEARCH,
|
||||
results: null
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_SEARCH_TERM,
|
||||
type: ActionTypes.RECEIVED_SEARCH_TERM,
|
||||
term: null,
|
||||
do_search: false,
|
||||
is_mention_search: false
|
||||
});
|
||||
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_POST_SELECTED,
|
||||
type: ActionTypes.RECEIVED_POST_SELECTED,
|
||||
results: null
|
||||
});
|
||||
}
|
||||
@@ -72,4 +72,4 @@ export default class SearchResultsHeader extends React.Component {
|
||||
|
||||
SearchResultsHeader.propTypes = {
|
||||
isMentionSearch: React.PropTypes.bool
|
||||
};
|
||||
};
|
||||
|
||||
@@ -84,7 +84,7 @@ class ImportThemeModal extends React.Component {
|
||||
Client.updateUser(user,
|
||||
(data) => {
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_ME,
|
||||
type: ActionTypes.RECEIVED_ME,
|
||||
me: data
|
||||
});
|
||||
|
||||
@@ -212,4 +212,4 @@ ImportThemeModal.propTypes = {
|
||||
intl: intlShape.isRequired
|
||||
};
|
||||
|
||||
export default injectIntl(ImportThemeModal);
|
||||
export default injectIntl(ImportThemeModal);
|
||||
|
||||
@@ -107,7 +107,7 @@ export default class ThemeSetting extends React.Component {
|
||||
Client.updateUser(user,
|
||||
(data) => {
|
||||
AppDispatcher.handleServerAction({
|
||||
type: ActionTypes.RECIEVED_ME,
|
||||
type: ActionTypes.RECEIVED_ME,
|
||||
me: data
|
||||
});
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user