Plt-4483 Removed unnecessary events from ChannelStore (#4407)
* PLT-4483 Removed MoreChange listener from ChannelStore * PLT-4483 Removed LeaveChannel listener from ChannelStore
Этот коммит содержится в:
коммит произвёл
Corey Hulen
родитель
ef53aa1e7f
Коммит
b4002ba55f
@@ -23,7 +23,6 @@ import SearchStore from 'stores/search_store.jsx';
|
|||||||
import PreferenceStore from 'stores/preference_store.jsx';
|
import PreferenceStore from 'stores/preference_store.jsx';
|
||||||
import WebrtcStore from 'stores/webrtc_store.jsx';
|
import WebrtcStore from 'stores/webrtc_store.jsx';
|
||||||
|
|
||||||
import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
|
|
||||||
import * as GlobalActions from 'actions/global_actions.jsx';
|
import * as GlobalActions from 'actions/global_actions.jsx';
|
||||||
import * as WebrtcActions from 'actions/webrtc_actions.jsx';
|
import * as WebrtcActions from 'actions/webrtc_actions.jsx';
|
||||||
import * as ChannelActions from 'actions/channel_actions.jsx';
|
import * as ChannelActions from 'actions/channel_actions.jsx';
|
||||||
@@ -34,7 +33,7 @@ import Client from 'client/web_client.jsx';
|
|||||||
import * as AsyncClient from 'utils/async_client.jsx';
|
import * as AsyncClient from 'utils/async_client.jsx';
|
||||||
import {getFlaggedPosts} from 'actions/post_actions.jsx';
|
import {getFlaggedPosts} from 'actions/post_actions.jsx';
|
||||||
|
|
||||||
import {ActionTypes, Constants, Preferences, UserStatuses} from 'utils/constants.jsx';
|
import {Constants, Preferences, UserStatuses} from 'utils/constants.jsx';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import {FormattedMessage} from 'react-intl';
|
import {FormattedMessage} from 'react-intl';
|
||||||
@@ -130,11 +129,6 @@ export default class ChannelHeader extends React.Component {
|
|||||||
() => {
|
() => {
|
||||||
const channelId = this.state.channel.id;
|
const channelId = this.state.channel.id;
|
||||||
|
|
||||||
AppDispatcher.handleViewAction({
|
|
||||||
type: ActionTypes.LEAVE_CHANNEL,
|
|
||||||
id: channelId
|
|
||||||
});
|
|
||||||
|
|
||||||
if (this.state.isFavorite) {
|
if (this.state.isFavorite) {
|
||||||
ChannelActions.unmarkFavorite(channelId);
|
ChannelActions.unmarkFavorite(channelId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export default class MoreChannels extends React.Component {
|
|||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
const self = this;
|
const self = this;
|
||||||
ChannelStore.addMoreChangeListener(this.onListenerChange);
|
ChannelStore.addChangeListener(this.onListenerChange);
|
||||||
|
|
||||||
$(this.refs.modal).on('shown.bs.modal', () => {
|
$(this.refs.modal).on('shown.bs.modal', () => {
|
||||||
AsyncClient.getMoreChannels(true);
|
AsyncClient.getMoreChannels(true);
|
||||||
@@ -54,7 +54,7 @@ export default class MoreChannels extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
ChannelStore.removeMoreChangeListener(this.onListenerChange);
|
ChannelStore.removeChangeListener(this.onListenerChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
getStateFromStores() {
|
getStateFromStores() {
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ export default class PostMessageContainer extends React.Component {
|
|||||||
PreferenceStore.addChangeListener(this.onPreferenceChange);
|
PreferenceStore.addChangeListener(this.onPreferenceChange);
|
||||||
UserStore.addChangeListener(this.onUserChange);
|
UserStore.addChangeListener(this.onUserChange);
|
||||||
ChannelStore.addChangeListener(this.onChannelChange);
|
ChannelStore.addChangeListener(this.onChannelChange);
|
||||||
ChannelStore.addMoreChangeListener(this.onChannelChange);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
@@ -56,7 +55,6 @@ export default class PostMessageContainer extends React.Component {
|
|||||||
PreferenceStore.removeChangeListener(this.onPreferenceChange);
|
PreferenceStore.removeChangeListener(this.onPreferenceChange);
|
||||||
UserStore.removeChangeListener(this.onUserChange);
|
UserStore.removeChangeListener(this.onUserChange);
|
||||||
ChannelStore.removeChangeListener(this.onChannelChange);
|
ChannelStore.removeChangeListener(this.onChannelChange);
|
||||||
ChannelStore.removeMoreChangeListener(this.onChannelChange);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onEmojiChange() {
|
onEmojiChange() {
|
||||||
|
|||||||
@@ -5,13 +5,10 @@ import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
|
|||||||
import EventEmitter from 'events';
|
import EventEmitter from 'events';
|
||||||
|
|
||||||
var Utils;
|
var Utils;
|
||||||
import Constants from 'utils/constants.jsx';
|
import {ActionTypes, Constants} from 'utils/constants.jsx';
|
||||||
const ActionTypes = Constants.ActionTypes;
|
|
||||||
const NotificationPrefs = Constants.NotificationPrefs;
|
const NotificationPrefs = Constants.NotificationPrefs;
|
||||||
|
|
||||||
const CHANGE_EVENT = 'change';
|
const CHANGE_EVENT = 'change';
|
||||||
const LEAVE_EVENT = 'leave';
|
|
||||||
const MORE_CHANGE_EVENT = 'change';
|
|
||||||
const STATS_EVENT = 'stats';
|
const STATS_EVENT = 'stats';
|
||||||
const LAST_VIEVED_EVENT = 'last_viewed';
|
const LAST_VIEVED_EVENT = 'last_viewed';
|
||||||
|
|
||||||
@@ -50,18 +47,6 @@ class ChannelStoreClass extends EventEmitter {
|
|||||||
this.removeListener(CHANGE_EVENT, callback);
|
this.removeListener(CHANGE_EVENT, callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
emitMoreChange() {
|
|
||||||
this.emit(MORE_CHANGE_EVENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
addMoreChangeListener(callback) {
|
|
||||||
this.on(MORE_CHANGE_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
removeMoreChangeListener(callback) {
|
|
||||||
this.removeListener(MORE_CHANGE_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
emitStatsChange() {
|
emitStatsChange() {
|
||||||
this.emit(STATS_EVENT);
|
this.emit(STATS_EVENT);
|
||||||
}
|
}
|
||||||
@@ -73,17 +58,6 @@ class ChannelStoreClass extends EventEmitter {
|
|||||||
removeStatsChangeListener(callback) {
|
removeStatsChangeListener(callback) {
|
||||||
this.removeListener(STATS_EVENT, callback);
|
this.removeListener(STATS_EVENT, callback);
|
||||||
}
|
}
|
||||||
emitLeave(id) {
|
|
||||||
this.emit(LEAVE_EVENT, id);
|
|
||||||
}
|
|
||||||
|
|
||||||
addLeaveListener(callback) {
|
|
||||||
this.on(LEAVE_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
removeLeaveListener(callback) {
|
|
||||||
this.removeListener(LEAVE_EVENT, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
emitLastViewed(lastViewed, ownNewMessage) {
|
emitLastViewed(lastViewed, ownNewMessage) {
|
||||||
this.emit(LAST_VIEVED_EVENT, lastViewed, ownNewMessage);
|
this.emit(LAST_VIEVED_EVENT, lastViewed, ownNewMessage);
|
||||||
@@ -321,14 +295,6 @@ class ChannelStoreClass extends EventEmitter {
|
|||||||
return this.unreadCounts;
|
return this.unreadCounts;
|
||||||
}
|
}
|
||||||
|
|
||||||
leaveChannel(id) {
|
|
||||||
Reflect.deleteProperty(this.myChannelMembers, id);
|
|
||||||
const element = this.channels.indexOf(id);
|
|
||||||
if (element > -1) {
|
|
||||||
this.channels.splice(element, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
getChannelNamesMap() {
|
getChannelNamesMap() {
|
||||||
var channelNamesMap = {};
|
var channelNamesMap = {};
|
||||||
|
|
||||||
@@ -404,7 +370,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
|
|||||||
break;
|
break;
|
||||||
case ActionTypes.RECEIVED_MORE_CHANNELS:
|
case ActionTypes.RECEIVED_MORE_CHANNELS:
|
||||||
ChannelStore.storeMoreChannels(action.channels);
|
ChannelStore.storeMoreChannels(action.channels);
|
||||||
ChannelStore.emitMoreChange();
|
ChannelStore.emitChange();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ActionTypes.RECEIVED_CHANNEL_STATS:
|
case ActionTypes.RECEIVED_CHANNEL_STATS:
|
||||||
@@ -414,11 +380,6 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
|
|||||||
ChannelStore.emitStatsChange();
|
ChannelStore.emitStatsChange();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ActionTypes.LEAVE_CHANNEL:
|
|
||||||
ChannelStore.leaveChannel(action.id);
|
|
||||||
ChannelStore.emitLeave(action.id);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ export const ActionTypes = keyMirror({
|
|||||||
|
|
||||||
CLICK_CHANNEL: null,
|
CLICK_CHANNEL: null,
|
||||||
CREATE_CHANNEL: null,
|
CREATE_CHANNEL: null,
|
||||||
LEAVE_CHANNEL: null,
|
|
||||||
CREATE_POST: null,
|
CREATE_POST: null,
|
||||||
CREATE_COMMENT: null,
|
CREATE_COMMENT: null,
|
||||||
POST_DELETED: null,
|
POST_DELETED: null,
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user