Merge pull request #1195 from mattermost/plt-822
PLT-822 Refactoring post_store into post_store and search_store
Этот коммит содержится в:
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
const ChannelStore = require('../stores/channel_store.jsx');
|
const ChannelStore = require('../stores/channel_store.jsx');
|
||||||
const UserStore = require('../stores/user_store.jsx');
|
const UserStore = require('../stores/user_store.jsx');
|
||||||
const PostStore = require('../stores/post_store.jsx');
|
const SearchStore = require('../stores/search_store.jsx');
|
||||||
const NavbarSearchBox = require('./search_bar.jsx');
|
const NavbarSearchBox = require('./search_bar.jsx');
|
||||||
const AsyncClient = require('../utils/async_client.jsx');
|
const AsyncClient = require('../utils/async_client.jsx');
|
||||||
const Client = require('../utils/client.jsx');
|
const Client = require('../utils/client.jsx');
|
||||||
@@ -35,19 +35,19 @@ export default class ChannelHeader extends React.Component {
|
|||||||
memberChannel: ChannelStore.getCurrentMember(),
|
memberChannel: ChannelStore.getCurrentMember(),
|
||||||
memberTeam: UserStore.getCurrentUser(),
|
memberTeam: UserStore.getCurrentUser(),
|
||||||
users: ChannelStore.getCurrentExtraInfo().members,
|
users: ChannelStore.getCurrentExtraInfo().members,
|
||||||
searchVisible: PostStore.getSearchResults() !== null
|
searchVisible: SearchStore.getSearchResults() !== null
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
ChannelStore.addChangeListener(this.onListenerChange);
|
ChannelStore.addChangeListener(this.onListenerChange);
|
||||||
ChannelStore.addExtraInfoChangeListener(this.onListenerChange);
|
ChannelStore.addExtraInfoChangeListener(this.onListenerChange);
|
||||||
PostStore.addSearchChangeListener(this.onListenerChange);
|
SearchStore.addSearchChangeListener(this.onListenerChange);
|
||||||
UserStore.addChangeListener(this.onListenerChange);
|
UserStore.addChangeListener(this.onListenerChange);
|
||||||
}
|
}
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
ChannelStore.removeChangeListener(this.onListenerChange);
|
ChannelStore.removeChangeListener(this.onListenerChange);
|
||||||
ChannelStore.removeExtraInfoChangeListener(this.onListenerChange);
|
ChannelStore.removeExtraInfoChangeListener(this.onListenerChange);
|
||||||
PostStore.removeSearchChangeListener(this.onListenerChange);
|
SearchStore.removeSearchChangeListener(this.onListenerChange);
|
||||||
UserStore.addChangeListener(this.onListenerChange);
|
UserStore.addChangeListener(this.onListenerChange);
|
||||||
}
|
}
|
||||||
onListenerChange() {
|
onListenerChange() {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
// See License.txt for license information.
|
// See License.txt for license information.
|
||||||
|
|
||||||
var UserStore = require('../stores/user_store.jsx');
|
var UserStore = require('../stores/user_store.jsx');
|
||||||
var PostStore = require('../stores/post_store.jsx');
|
var SearchStore = require('../stores/search_store.jsx');
|
||||||
var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
|
var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
|
||||||
var Mention = require('./mention.jsx');
|
var Mention = require('./mention.jsx');
|
||||||
|
|
||||||
@@ -66,7 +66,7 @@ export default class MentionList extends React.Component {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
PostStore.addMentionDataChangeListener(this.onListenerChange);
|
SearchStore.addMentionDataChangeListener(this.onListenerChange);
|
||||||
|
|
||||||
$('.post-right__scroll').scroll(this.onScroll);
|
$('.post-right__scroll').scroll(this.onScroll);
|
||||||
|
|
||||||
@@ -74,7 +74,7 @@ export default class MentionList extends React.Component {
|
|||||||
$(document).click(this.onClick);
|
$(document).click(this.onClick);
|
||||||
}
|
}
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
PostStore.removeMentionDataChangeListener(this.onListenerChange);
|
SearchStore.removeMentionDataChangeListener(this.onListenerChange);
|
||||||
$('body').off('keydown.mentionlist', '#' + this.props.id);
|
$('body').off('keydown.mentionlist', '#' + this.props.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
var client = require('../utils/client.jsx');
|
var client = require('../utils/client.jsx');
|
||||||
var AsyncClient = require('../utils/async_client.jsx');
|
var AsyncClient = require('../utils/async_client.jsx');
|
||||||
var PostStore = require('../stores/post_store.jsx');
|
var SearchStore = require('../stores/search_store.jsx');
|
||||||
var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
|
var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
|
||||||
var utils = require('../utils/utils.jsx');
|
var utils = require('../utils/utils.jsx');
|
||||||
var Constants = require('../utils/constants.jsx');
|
var Constants = require('../utils/constants.jsx');
|
||||||
@@ -30,17 +30,17 @@ export default class SearchBar extends React.Component {
|
|||||||
this.state = state;
|
this.state = state;
|
||||||
}
|
}
|
||||||
getSearchTermStateFromStores() {
|
getSearchTermStateFromStores() {
|
||||||
var term = PostStore.getSearchTerm() || '';
|
var term = SearchStore.getSearchTerm() || '';
|
||||||
return {
|
return {
|
||||||
searchTerm: term
|
searchTerm: term
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
PostStore.addSearchTermChangeListener(this.onListenerChange);
|
SearchStore.addSearchTermChangeListener(this.onListenerChange);
|
||||||
this.mounted = true;
|
this.mounted = true;
|
||||||
}
|
}
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
PostStore.removeSearchTermChangeListener(this.onListenerChange);
|
SearchStore.removeSearchTermChangeListener(this.onListenerChange);
|
||||||
this.mounted = false;
|
this.mounted = false;
|
||||||
}
|
}
|
||||||
onListenerChange(doSearch, isMentionSearch) {
|
onListenerChange(doSearch, isMentionSearch) {
|
||||||
@@ -84,8 +84,8 @@ export default class SearchBar extends React.Component {
|
|||||||
}
|
}
|
||||||
handleUserInput(e) {
|
handleUserInput(e) {
|
||||||
var term = e.target.value;
|
var term = e.target.value;
|
||||||
PostStore.storeSearchTerm(term);
|
SearchStore.storeSearchTerm(term);
|
||||||
PostStore.emitSearchTermChange(false);
|
SearchStore.emitSearchTermChange(false);
|
||||||
this.setState({searchTerm: term});
|
this.setState({searchTerm: term});
|
||||||
|
|
||||||
this.refs.autocomplete.handleInputChange(e.target, term);
|
this.refs.autocomplete.handleInputChange(e.target, term);
|
||||||
@@ -150,8 +150,8 @@ export default class SearchBar extends React.Component {
|
|||||||
textbox.value = text;
|
textbox.value = text;
|
||||||
utils.setCaretPosition(textbox, preText.length + word.length);
|
utils.setCaretPosition(textbox, preText.length + word.length);
|
||||||
|
|
||||||
PostStore.storeSearchTerm(text);
|
SearchStore.storeSearchTerm(text);
|
||||||
PostStore.emitSearchTermChange(false);
|
SearchStore.emitSearchTermChange(false);
|
||||||
this.setState({searchTerm: text});
|
this.setState({searchTerm: text});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||||
// See License.txt for license information.
|
// See License.txt for license information.
|
||||||
|
|
||||||
var PostStore = require('../stores/post_store.jsx');
|
var SearchStore = require('../stores/search_store.jsx');
|
||||||
var UserStore = require('../stores/user_store.jsx');
|
var UserStore = require('../stores/user_store.jsx');
|
||||||
var SearchBox = require('./search_bar.jsx');
|
var SearchBox = require('./search_bar.jsx');
|
||||||
var Utils = require('../utils/utils.jsx');
|
var Utils = require('../utils/utils.jsx');
|
||||||
@@ -9,7 +9,7 @@ var SearchResultsHeader = require('./search_results_header.jsx');
|
|||||||
var SearchResultsItem = require('./search_results_item.jsx');
|
var SearchResultsItem = require('./search_results_item.jsx');
|
||||||
|
|
||||||
function getStateFromStores() {
|
function getStateFromStores() {
|
||||||
return {results: PostStore.getSearchResults()};
|
return {results: SearchStore.getSearchResults()};
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class SearchResults extends React.Component {
|
export default class SearchResults extends React.Component {
|
||||||
@@ -30,7 +30,7 @@ export default class SearchResults extends React.Component {
|
|||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
this.mounted = true;
|
this.mounted = true;
|
||||||
PostStore.addSearchChangeListener(this.onChange);
|
SearchStore.addSearchChangeListener(this.onChange);
|
||||||
this.resize();
|
this.resize();
|
||||||
window.addEventListener('resize', this.handleResize);
|
window.addEventListener('resize', this.handleResize);
|
||||||
}
|
}
|
||||||
@@ -40,7 +40,7 @@ export default class SearchResults extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
PostStore.removeSearchChangeListener(this.onChange);
|
SearchStore.removeSearchChangeListener(this.onChange);
|
||||||
this.mounted = false;
|
this.mounted = false;
|
||||||
window.removeEventListener('resize', this.handleResize);
|
window.removeEventListener('resize', this.handleResize);
|
||||||
}
|
}
|
||||||
@@ -78,7 +78,7 @@ export default class SearchResults extends React.Component {
|
|||||||
searchForm = <SearchBox />;
|
searchForm = <SearchBox />;
|
||||||
}
|
}
|
||||||
var noResults = (!results || !results.order || !results.order.length);
|
var noResults = (!results || !results.order || !results.order.length);
|
||||||
var searchTerm = PostStore.getSearchTerm();
|
var searchTerm = SearchStore.getSearchTerm();
|
||||||
|
|
||||||
var ctls = null;
|
var ctls = null;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||||
// See License.txt for license information.
|
// See License.txt for license information.
|
||||||
|
|
||||||
var PostStore = require('../stores/post_store.jsx');
|
var SearchStore = require('../stores/search_store.jsx');
|
||||||
var ChannelStore = require('../stores/channel_store.jsx');
|
var ChannelStore = require('../stores/channel_store.jsx');
|
||||||
var UserStore = require('../stores/user_store.jsx');
|
var UserStore = require('../stores/user_store.jsx');
|
||||||
var UserProfile = require('./user_profile.jsx');
|
var UserProfile = require('./user_profile.jsx');
|
||||||
@@ -32,7 +32,7 @@ export default class SearchResultsItem extends React.Component {
|
|||||||
AppDispatcher.handleServerAction({
|
AppDispatcher.handleServerAction({
|
||||||
type: ActionTypes.RECIEVED_POST_SELECTED,
|
type: ActionTypes.RECIEVED_POST_SELECTED,
|
||||||
post_list: data,
|
post_list: data,
|
||||||
from_search: PostStore.getSearchTerm()
|
from_search: SearchStore.getSearchTerm()
|
||||||
});
|
});
|
||||||
|
|
||||||
AppDispatcher.handleServerAction({
|
AppDispatcher.handleServerAction({
|
||||||
|
|||||||
@@ -3,11 +3,12 @@
|
|||||||
|
|
||||||
var SearchResults = require('./search_results.jsx');
|
var SearchResults = require('./search_results.jsx');
|
||||||
var RhsThread = require('./rhs_thread.jsx');
|
var RhsThread = require('./rhs_thread.jsx');
|
||||||
|
var SearchStore = require('../stores/search_store.jsx');
|
||||||
var PostStore = require('../stores/post_store.jsx');
|
var PostStore = require('../stores/post_store.jsx');
|
||||||
var Utils = require('../utils/utils.jsx');
|
var Utils = require('../utils/utils.jsx');
|
||||||
|
|
||||||
function getStateFromStores() {
|
function getStateFromStores() {
|
||||||
return {search_visible: PostStore.getSearchResults() != null, post_right_visible: PostStore.getSelectedPost() != null, is_mention_search: PostStore.getIsMentionSearch()};
|
return {search_visible: SearchStore.getSearchResults() != null, post_right_visible: PostStore.getSelectedPost() != null, is_mention_search: SearchStore.getIsMentionSearch()};
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class SidebarRight extends React.Component {
|
export default class SidebarRight extends React.Component {
|
||||||
@@ -22,11 +23,11 @@ export default class SidebarRight extends React.Component {
|
|||||||
this.state = getStateFromStores();
|
this.state = getStateFromStores();
|
||||||
}
|
}
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
PostStore.addSearchChangeListener(this.onSearchChange);
|
SearchStore.addSearchChangeListener(this.onSearchChange);
|
||||||
PostStore.addSelectedPostChangeListener(this.onSelectedChange);
|
PostStore.addSelectedPostChangeListener(this.onSelectedChange);
|
||||||
}
|
}
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
PostStore.removeSearchChangeListener(this.onSearchChange);
|
SearchStore.removeSearchChangeListener(this.onSearchChange);
|
||||||
PostStore.removeSelectedPostChangeListener(this.onSelectedChange);
|
PostStore.removeSelectedPostChangeListener(this.onSelectedChange);
|
||||||
}
|
}
|
||||||
componentDidUpdate() {
|
componentDidUpdate() {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
// See License.txt for license information.
|
// See License.txt for license information.
|
||||||
|
|
||||||
const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
|
const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
|
||||||
const PostStore = require('../stores/post_store.jsx');
|
const SearchStore = require('../stores/search_store.jsx');
|
||||||
const CommandList = require('./command_list.jsx');
|
const CommandList = require('./command_list.jsx');
|
||||||
const ErrorStore = require('../stores/error_store.jsx');
|
const ErrorStore = require('../stores/error_store.jsx');
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ export default class Textbox extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
PostStore.addAddMentionListener(this.onListenerChange);
|
SearchStore.addAddMentionListener(this.onListenerChange);
|
||||||
ErrorStore.addChangeListener(this.onRecievedError);
|
ErrorStore.addChangeListener(this.onRecievedError);
|
||||||
|
|
||||||
this.resize();
|
this.resize();
|
||||||
@@ -62,7 +62,7 @@ export default class Textbox extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
PostStore.removeAddMentionListener(this.onListenerChange);
|
SearchStore.removeAddMentionListener(this.onListenerChange);
|
||||||
ErrorStore.removeChangeListener(this.onRecievedError);
|
ErrorStore.removeChangeListener(this.onRecievedError);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,11 +12,7 @@ var Constants = require('../utils/constants.jsx');
|
|||||||
var ActionTypes = Constants.ActionTypes;
|
var ActionTypes = Constants.ActionTypes;
|
||||||
|
|
||||||
var CHANGE_EVENT = 'change';
|
var CHANGE_EVENT = 'change';
|
||||||
var SEARCH_CHANGE_EVENT = 'search_change';
|
|
||||||
var SEARCH_TERM_CHANGE_EVENT = 'search_term_change';
|
|
||||||
var SELECTED_POST_CHANGE_EVENT = 'selected_post_change';
|
var SELECTED_POST_CHANGE_EVENT = 'selected_post_change';
|
||||||
var MENTION_DATA_CHANGE_EVENT = 'mention_data_change';
|
|
||||||
var ADD_MENTION_EVENT = 'add_mention';
|
|
||||||
var EDIT_POST_EVENT = 'edit_post';
|
var EDIT_POST_EVENT = 'edit_post';
|
||||||
|
|
||||||
class PostStoreClass extends EventEmitter {
|
class PostStoreClass extends EventEmitter {
|
||||||
@@ -26,21 +22,15 @@ class PostStoreClass extends EventEmitter {
|
|||||||
this.emitChange = this.emitChange.bind(this);
|
this.emitChange = this.emitChange.bind(this);
|
||||||
this.addChangeListener = this.addChangeListener.bind(this);
|
this.addChangeListener = this.addChangeListener.bind(this);
|
||||||
this.removeChangeListener = this.removeChangeListener.bind(this);
|
this.removeChangeListener = this.removeChangeListener.bind(this);
|
||||||
this.emitSearchChange = this.emitSearchChange.bind(this);
|
|
||||||
this.addSearchChangeListener = this.addSearchChangeListener.bind(this);
|
|
||||||
this.removeSearchChangeListener = this.removeSearchChangeListener.bind(this);
|
|
||||||
this.emitSearchTermChange = this.emitSearchTermChange.bind(this);
|
|
||||||
this.addSearchTermChangeListener = this.addSearchTermChangeListener.bind(this);
|
|
||||||
this.removeSearchTermChangeListener = this.removeSearchTermChangeListener.bind(this);
|
|
||||||
this.emitSelectedPostChange = this.emitSelectedPostChange.bind(this);
|
this.emitSelectedPostChange = this.emitSelectedPostChange.bind(this);
|
||||||
this.addSelectedPostChangeListener = this.addSelectedPostChangeListener.bind(this);
|
this.addSelectedPostChangeListener = this.addSelectedPostChangeListener.bind(this);
|
||||||
this.removeSelectedPostChangeListener = this.removeSelectedPostChangeListener.bind(this);
|
this.removeSelectedPostChangeListener = this.removeSelectedPostChangeListener.bind(this);
|
||||||
this.emitMentionDataChange = this.emitMentionDataChange.bind(this);
|
|
||||||
this.addMentionDataChangeListener = this.addMentionDataChangeListener.bind(this);
|
this.emitEditPost = this.emitEditPost.bind(this);
|
||||||
this.removeMentionDataChangeListener = this.removeMentionDataChangeListener.bind(this);
|
this.addEditPostListener = this.addEditPostListener.bind(this);
|
||||||
this.emitAddMention = this.emitAddMention.bind(this);
|
this.removeEditPostListener = this.removeEditPostListener.bind(this);
|
||||||
this.addAddMentionListener = this.addAddMentionListener.bind(this);
|
|
||||||
this.removeAddMentionListener = this.removeAddMentionListener.bind(this);
|
|
||||||
this.getCurrentPosts = this.getCurrentPosts.bind(this);
|
this.getCurrentPosts = this.getCurrentPosts.bind(this);
|
||||||
this.storePosts = this.storePosts.bind(this);
|
this.storePosts = this.storePosts.bind(this);
|
||||||
this.pStorePosts = this.pStorePosts.bind(this);
|
this.pStorePosts = this.pStorePosts.bind(this);
|
||||||
@@ -59,13 +49,8 @@ class PostStoreClass extends EventEmitter {
|
|||||||
this.pRemovePendingPost = this.pRemovePendingPost.bind(this);
|
this.pRemovePendingPost = this.pRemovePendingPost.bind(this);
|
||||||
this.clearPendingPosts = this.clearPendingPosts.bind(this);
|
this.clearPendingPosts = this.clearPendingPosts.bind(this);
|
||||||
this.updatePendingPost = this.updatePendingPost.bind(this);
|
this.updatePendingPost = this.updatePendingPost.bind(this);
|
||||||
this.storeSearchResults = this.storeSearchResults.bind(this);
|
|
||||||
this.getSearchResults = this.getSearchResults.bind(this);
|
|
||||||
this.getIsMentionSearch = this.getIsMentionSearch.bind(this);
|
|
||||||
this.storeSelectedPost = this.storeSelectedPost.bind(this);
|
this.storeSelectedPost = this.storeSelectedPost.bind(this);
|
||||||
this.getSelectedPost = this.getSelectedPost.bind(this);
|
this.getSelectedPost = this.getSelectedPost.bind(this);
|
||||||
this.storeSearchTerm = this.storeSearchTerm.bind(this);
|
|
||||||
this.getSearchTerm = this.getSearchTerm.bind(this);
|
|
||||||
this.getEmptyDraft = this.getEmptyDraft.bind(this);
|
this.getEmptyDraft = this.getEmptyDraft.bind(this);
|
||||||
this.storeCurrentDraft = this.storeCurrentDraft.bind(this);
|
this.storeCurrentDraft = this.storeCurrentDraft.bind(this);
|
||||||
this.getCurrentDraft = this.getCurrentDraft.bind(this);
|
this.getCurrentDraft = this.getCurrentDraft.bind(this);
|
||||||
@@ -77,9 +62,6 @@ class PostStoreClass extends EventEmitter {
|
|||||||
this.clearCommentDraftUploads = this.clearCommentDraftUploads.bind(this);
|
this.clearCommentDraftUploads = this.clearCommentDraftUploads.bind(this);
|
||||||
this.storeLatestUpdate = this.storeLatestUpdate.bind(this);
|
this.storeLatestUpdate = this.storeLatestUpdate.bind(this);
|
||||||
this.getLatestUpdate = this.getLatestUpdate.bind(this);
|
this.getLatestUpdate = this.getLatestUpdate.bind(this);
|
||||||
this.emitEditPost = this.emitEditPost.bind(this);
|
|
||||||
this.addEditPostListener = this.addEditPostListener.bind(this);
|
|
||||||
this.removeEditPostListener = this.removeEditPostListener.bind(this);
|
|
||||||
this.getCurrentUsersLatestPost = this.getCurrentUsersLatestPost.bind(this);
|
this.getCurrentUsersLatestPost = this.getCurrentUsersLatestPost.bind(this);
|
||||||
}
|
}
|
||||||
emitChange() {
|
emitChange() {
|
||||||
@@ -94,30 +76,6 @@ class PostStoreClass extends EventEmitter {
|
|||||||
this.removeListener(CHANGE_EVENT, callback);
|
this.removeListener(CHANGE_EVENT, callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
emitSearchChange() {
|
|
||||||
this.emit(SEARCH_CHANGE_EVENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
addSearchChangeListener(callback) {
|
|
||||||
this.on(SEARCH_CHANGE_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
removeSearchChangeListener(callback) {
|
|
||||||
this.removeListener(SEARCH_CHANGE_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
emitSearchTermChange(doSearch, isMentionSearch) {
|
|
||||||
this.emit(SEARCH_TERM_CHANGE_EVENT, doSearch, isMentionSearch);
|
|
||||||
}
|
|
||||||
|
|
||||||
addSearchTermChangeListener(callback) {
|
|
||||||
this.on(SEARCH_TERM_CHANGE_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
removeSearchTermChangeListener(callback) {
|
|
||||||
this.removeListener(SEARCH_TERM_CHANGE_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
emitSelectedPostChange(fromSearch) {
|
emitSelectedPostChange(fromSearch) {
|
||||||
this.emit(SELECTED_POST_CHANGE_EVENT, fromSearch);
|
this.emit(SELECTED_POST_CHANGE_EVENT, fromSearch);
|
||||||
}
|
}
|
||||||
@@ -130,30 +88,6 @@ class PostStoreClass extends EventEmitter {
|
|||||||
this.removeListener(SELECTED_POST_CHANGE_EVENT, callback);
|
this.removeListener(SELECTED_POST_CHANGE_EVENT, callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
emitMentionDataChange(id, mentionText) {
|
|
||||||
this.emit(MENTION_DATA_CHANGE_EVENT, id, mentionText);
|
|
||||||
}
|
|
||||||
|
|
||||||
addMentionDataChangeListener(callback) {
|
|
||||||
this.on(MENTION_DATA_CHANGE_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
removeMentionDataChangeListener(callback) {
|
|
||||||
this.removeListener(MENTION_DATA_CHANGE_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
emitAddMention(id, username) {
|
|
||||||
this.emit(ADD_MENTION_EVENT, id, username);
|
|
||||||
}
|
|
||||||
|
|
||||||
addAddMentionListener(callback) {
|
|
||||||
this.on(ADD_MENTION_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
removeAddMentionListener(callback) {
|
|
||||||
this.removeListener(ADD_MENTION_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
emitEditPost(post) {
|
emitEditPost(post) {
|
||||||
this.emit(EDIT_POST_EVENT, post);
|
this.emit(EDIT_POST_EVENT, post);
|
||||||
}
|
}
|
||||||
@@ -181,9 +115,9 @@ class PostStoreClass extends EventEmitter {
|
|||||||
|
|
||||||
var postList = makePostListNonNull(this.getPosts(channelId));
|
var postList = makePostListNonNull(this.getPosts(channelId));
|
||||||
|
|
||||||
for (let pid in newPostList.posts) {
|
for (const pid in newPostList.posts) {
|
||||||
if (newPostList.posts.hasOwnProperty(pid)) {
|
if (newPostList.posts.hasOwnProperty(pid)) {
|
||||||
var np = newPostList.posts[pid];
|
const np = newPostList.posts[pid];
|
||||||
if (np.delete_at === 0) {
|
if (np.delete_at === 0) {
|
||||||
postList.posts[pid] = np;
|
postList.posts[pid] = np;
|
||||||
if (postList.order.indexOf(pid) === -1) {
|
if (postList.order.indexOf(pid) === -1) {
|
||||||
@@ -194,7 +128,7 @@ class PostStoreClass extends EventEmitter {
|
|||||||
delete postList.posts[pid];
|
delete postList.posts[pid];
|
||||||
}
|
}
|
||||||
|
|
||||||
var index = postList.order.indexOf(pid);
|
const index = postList.order.indexOf(pid);
|
||||||
if (index !== -1) {
|
if (index !== -1) {
|
||||||
postList.order.splice(index, 1);
|
postList.order.splice(index, 1);
|
||||||
}
|
}
|
||||||
@@ -202,7 +136,7 @@ class PostStoreClass extends EventEmitter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
postList.order.sort(function postSort(a, b) {
|
postList.order.sort((a, b) => {
|
||||||
if (postList.posts[a].create_at > postList.posts[b].create_at) {
|
if (postList.posts[a].create_at > postList.posts[b].create_at) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@@ -306,7 +240,7 @@ class PostStoreClass extends EventEmitter {
|
|||||||
var posts = postList.posts;
|
var posts = postList.posts;
|
||||||
|
|
||||||
// sort failed posts to the bottom
|
// sort failed posts to the bottom
|
||||||
postList.order.sort(function postSort(a, b) {
|
postList.order.sort((a, b) => {
|
||||||
if (posts[a].state === Constants.POST_LOADING && posts[b].state === Constants.POST_FAILED) {
|
if (posts[a].state === Constants.POST_LOADING && posts[b].state === Constants.POST_FAILED) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -371,7 +305,7 @@ class PostStoreClass extends EventEmitter {
|
|||||||
this.pStorePendingPosts(channelId, postList);
|
this.pStorePendingPosts(channelId, postList);
|
||||||
}
|
}
|
||||||
clearPendingPosts() {
|
clearPendingPosts() {
|
||||||
BrowserStore.actionOnGlobalItemsWithPrefix('pending_posts_', function clearPending(key) {
|
BrowserStore.actionOnGlobalItemsWithPrefix('pending_posts_', (key) => {
|
||||||
BrowserStore.removeItem(key);
|
BrowserStore.removeItem(key);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -387,28 +321,12 @@ class PostStoreClass extends EventEmitter {
|
|||||||
this.pStorePendingPosts(post.channel_id, postList);
|
this.pStorePendingPosts(post.channel_id, postList);
|
||||||
this.emitChange();
|
this.emitChange();
|
||||||
}
|
}
|
||||||
storeSearchResults(results, isMentionSearch) {
|
|
||||||
BrowserStore.setItem('search_results', results);
|
|
||||||
BrowserStore.setItem('is_mention_search', Boolean(isMentionSearch));
|
|
||||||
}
|
|
||||||
getSearchResults() {
|
|
||||||
return BrowserStore.getItem('search_results');
|
|
||||||
}
|
|
||||||
getIsMentionSearch() {
|
|
||||||
return BrowserStore.getItem('is_mention_search');
|
|
||||||
}
|
|
||||||
storeSelectedPost(postList) {
|
storeSelectedPost(postList) {
|
||||||
BrowserStore.setItem('select_post', postList);
|
BrowserStore.setItem('select_post', postList);
|
||||||
}
|
}
|
||||||
getSelectedPost() {
|
getSelectedPost() {
|
||||||
return BrowserStore.getItem('select_post');
|
return BrowserStore.getItem('select_post');
|
||||||
}
|
}
|
||||||
storeSearchTerm(term) {
|
|
||||||
BrowserStore.setItem('search_term', term);
|
|
||||||
}
|
|
||||||
getSearchTerm() {
|
|
||||||
return BrowserStore.getItem('search_term');
|
|
||||||
}
|
|
||||||
getEmptyDraft() {
|
getEmptyDraft() {
|
||||||
return {message: '', uploadsInProgress: [], previews: []};
|
return {message: '', uploadsInProgress: [], previews: []};
|
||||||
}
|
}
|
||||||
@@ -433,7 +351,7 @@ class PostStoreClass extends EventEmitter {
|
|||||||
return BrowserStore.getGlobalItem('comment_draft_' + parentPostId, this.getEmptyDraft());
|
return BrowserStore.getGlobalItem('comment_draft_' + parentPostId, this.getEmptyDraft());
|
||||||
}
|
}
|
||||||
clearDraftUploads() {
|
clearDraftUploads() {
|
||||||
BrowserStore.actionOnGlobalItemsWithPrefix('draft_', function clearUploads(key, value) {
|
BrowserStore.actionOnGlobalItemsWithPrefix('draft_', (key, value) => {
|
||||||
if (value) {
|
if (value) {
|
||||||
value.uploadsInProgress = [];
|
value.uploadsInProgress = [];
|
||||||
BrowserStore.setItem(key, value);
|
BrowserStore.setItem(key, value);
|
||||||
@@ -441,7 +359,7 @@ class PostStoreClass extends EventEmitter {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
clearCommentDraftUploads() {
|
clearCommentDraftUploads() {
|
||||||
BrowserStore.actionOnGlobalItemsWithPrefix('comment_draft_', function clearUploads(key, value) {
|
BrowserStore.actionOnGlobalItemsWithPrefix('comment_draft_', (key, value) => {
|
||||||
if (value) {
|
if (value) {
|
||||||
value.uploadsInProgress = [];
|
value.uploadsInProgress = [];
|
||||||
BrowserStore.setItem(key, value);
|
BrowserStore.setItem(key, value);
|
||||||
@@ -458,7 +376,7 @@ class PostStoreClass extends EventEmitter {
|
|||||||
|
|
||||||
var PostStore = new PostStoreClass();
|
var PostStore = new PostStoreClass();
|
||||||
|
|
||||||
PostStore.dispatchToken = AppDispatcher.register(function registry(payload) {
|
PostStore.dispatchToken = AppDispatcher.register((payload) => {
|
||||||
var action = payload.action;
|
var action = payload.action;
|
||||||
|
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
@@ -469,24 +387,10 @@ PostStore.dispatchToken = AppDispatcher.register(function registry(payload) {
|
|||||||
PostStore.pStorePost(action.post);
|
PostStore.pStorePost(action.post);
|
||||||
PostStore.emitChange();
|
PostStore.emitChange();
|
||||||
break;
|
break;
|
||||||
case ActionTypes.RECIEVED_SEARCH:
|
|
||||||
PostStore.storeSearchResults(action.results, action.is_mention_search);
|
|
||||||
PostStore.emitSearchChange();
|
|
||||||
break;
|
|
||||||
case ActionTypes.RECIEVED_SEARCH_TERM:
|
|
||||||
PostStore.storeSearchTerm(action.term);
|
|
||||||
PostStore.emitSearchTermChange(action.do_search, action.is_mention_search);
|
|
||||||
break;
|
|
||||||
case ActionTypes.RECIEVED_POST_SELECTED:
|
case ActionTypes.RECIEVED_POST_SELECTED:
|
||||||
PostStore.storeSelectedPost(action.post_list);
|
PostStore.storeSelectedPost(action.post_list);
|
||||||
PostStore.emitSelectedPostChange(action.from_search);
|
PostStore.emitSelectedPostChange(action.from_search);
|
||||||
break;
|
break;
|
||||||
case ActionTypes.RECIEVED_MENTION_DATA:
|
|
||||||
PostStore.emitMentionDataChange(action.id, action.mention_text);
|
|
||||||
break;
|
|
||||||
case ActionTypes.RECIEVED_ADD_MENTION:
|
|
||||||
PostStore.emitAddMention(action.id, action.username);
|
|
||||||
break;
|
|
||||||
case ActionTypes.RECIEVED_EDIT_POST:
|
case ActionTypes.RECIEVED_EDIT_POST:
|
||||||
PostStore.emitEditPost(action);
|
PostStore.emitEditPost(action);
|
||||||
break;
|
break;
|
||||||
|
|||||||
153
web/react/stores/search_store.jsx
Обычный файл
153
web/react/stores/search_store.jsx
Обычный файл
@@ -0,0 +1,153 @@
|
|||||||
|
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||||
|
// See License.txt for license information.
|
||||||
|
|
||||||
|
var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
|
||||||
|
var EventEmitter = require('events').EventEmitter;
|
||||||
|
|
||||||
|
var BrowserStore = require('../stores/browser_store.jsx');
|
||||||
|
|
||||||
|
var Constants = require('../utils/constants.jsx');
|
||||||
|
var ActionTypes = Constants.ActionTypes;
|
||||||
|
|
||||||
|
var CHANGE_EVENT = 'change';
|
||||||
|
var SEARCH_CHANGE_EVENT = 'search_change';
|
||||||
|
var SEARCH_TERM_CHANGE_EVENT = 'search_term_change';
|
||||||
|
var MENTION_DATA_CHANGE_EVENT = 'mention_data_change';
|
||||||
|
var ADD_MENTION_EVENT = 'add_mention';
|
||||||
|
|
||||||
|
class SearchStoreClass extends EventEmitter {
|
||||||
|
constructor() {
|
||||||
|
super();
|
||||||
|
|
||||||
|
this.emitChange = this.emitChange.bind(this);
|
||||||
|
this.addChangeListener = this.addChangeListener.bind(this);
|
||||||
|
this.removeChangeListener = this.removeChangeListener.bind(this);
|
||||||
|
|
||||||
|
this.emitSearchChange = this.emitSearchChange.bind(this);
|
||||||
|
this.addSearchChangeListener = this.addSearchChangeListener.bind(this);
|
||||||
|
this.removeSearchChangeListener = this.removeSearchChangeListener.bind(this);
|
||||||
|
|
||||||
|
this.emitSearchTermChange = this.emitSearchTermChange.bind(this);
|
||||||
|
this.addSearchTermChangeListener = this.addSearchTermChangeListener.bind(this);
|
||||||
|
this.removeSearchTermChangeListener = this.removeSearchTermChangeListener.bind(this);
|
||||||
|
|
||||||
|
this.emitMentionDataChange = this.emitMentionDataChange.bind(this);
|
||||||
|
this.addMentionDataChangeListener = this.addMentionDataChangeListener.bind(this);
|
||||||
|
this.removeMentionDataChangeListener = this.removeMentionDataChangeListener.bind(this);
|
||||||
|
|
||||||
|
this.getSearchResults = this.getSearchResults.bind(this);
|
||||||
|
this.getIsMentionSearch = this.getIsMentionSearch.bind(this);
|
||||||
|
|
||||||
|
this.storeSearchTerm = this.storeSearchTerm.bind(this);
|
||||||
|
this.getSearchTerm = this.getSearchTerm.bind(this);
|
||||||
|
|
||||||
|
this.storeSearchResults = this.storeSearchResults.bind(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
emitChange() {
|
||||||
|
this.emit(CHANGE_EVENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
addChangeListener(callback) {
|
||||||
|
this.on(CHANGE_EVENT, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
removeChangeListener(callback) {
|
||||||
|
this.removeListener(CHANGE_EVENT, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
emitSearchChange() {
|
||||||
|
this.emit(SEARCH_CHANGE_EVENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
addSearchChangeListener(callback) {
|
||||||
|
this.on(SEARCH_CHANGE_EVENT, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
removeSearchChangeListener(callback) {
|
||||||
|
this.removeListener(SEARCH_CHANGE_EVENT, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
emitSearchTermChange(doSearch, isMentionSearch) {
|
||||||
|
this.emit(SEARCH_TERM_CHANGE_EVENT, doSearch, isMentionSearch);
|
||||||
|
}
|
||||||
|
|
||||||
|
addSearchTermChangeListener(callback) {
|
||||||
|
this.on(SEARCH_TERM_CHANGE_EVENT, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
removeSearchTermChangeListener(callback) {
|
||||||
|
this.removeListener(SEARCH_TERM_CHANGE_EVENT, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
getSearchResults() {
|
||||||
|
return BrowserStore.getItem('search_results');
|
||||||
|
}
|
||||||
|
|
||||||
|
getIsMentionSearch() {
|
||||||
|
return BrowserStore.getItem('is_mention_search');
|
||||||
|
}
|
||||||
|
|
||||||
|
storeSearchTerm(term) {
|
||||||
|
BrowserStore.setItem('search_term', term);
|
||||||
|
}
|
||||||
|
|
||||||
|
getSearchTerm() {
|
||||||
|
return BrowserStore.getItem('search_term');
|
||||||
|
}
|
||||||
|
|
||||||
|
emitMentionDataChange(id, mentionText) {
|
||||||
|
this.emit(MENTION_DATA_CHANGE_EVENT, id, mentionText);
|
||||||
|
}
|
||||||
|
|
||||||
|
addMentionDataChangeListener(callback) {
|
||||||
|
this.on(MENTION_DATA_CHANGE_EVENT, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
removeMentionDataChangeListener(callback) {
|
||||||
|
this.removeListener(MENTION_DATA_CHANGE_EVENT, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
emitAddMention(id, username) {
|
||||||
|
this.emit(ADD_MENTION_EVENT, id, username);
|
||||||
|
}
|
||||||
|
|
||||||
|
addAddMentionListener(callback) {
|
||||||
|
this.on(ADD_MENTION_EVENT, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
removeAddMentionListener(callback) {
|
||||||
|
this.removeListener(ADD_MENTION_EVENT, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
storeSearchResults(results, isMentionSearch) {
|
||||||
|
BrowserStore.setItem('search_results', results);
|
||||||
|
BrowserStore.setItem('is_mention_search', Boolean(isMentionSearch));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var SearchStore = new SearchStoreClass();
|
||||||
|
|
||||||
|
SearchStore.dispatchToken = AppDispatcher.register((payload) => {
|
||||||
|
var action = payload.action;
|
||||||
|
|
||||||
|
switch (action.type) {
|
||||||
|
case ActionTypes.RECIEVED_SEARCH:
|
||||||
|
SearchStore.storeSearchResults(action.results, action.is_mention_search);
|
||||||
|
SearchStore.emitSearchChange();
|
||||||
|
break;
|
||||||
|
case ActionTypes.RECIEVED_SEARCH_TERM:
|
||||||
|
SearchStore.storeSearchTerm(action.term);
|
||||||
|
SearchStore.emitSearchTermChange(action.do_search, action.is_mention_search);
|
||||||
|
break;
|
||||||
|
case ActionTypes.RECIEVED_MENTION_DATA:
|
||||||
|
SearchStore.emitMentionDataChange(action.id, action.mention_text);
|
||||||
|
break;
|
||||||
|
case ActionTypes.RECIEVED_ADD_MENTION:
|
||||||
|
SearchStore.emitAddMention(action.id, action.username);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
export default SearchStore;
|
||||||
Ссылка в новой задаче
Block a user