e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Nick changes get handled properly by the server IRC client, user count stays hidden when the selected tab is not a channel

Browse source
This commit is contained in:
khlieng 2015-02-07 00:16:51 +01:00
parent 0a47f2ae4a
commit e942924c15
5 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/js/components/ChatTitle.jsx
View file

@ -26,7 +26,7 @@ var ChatTitle = React.createClass({
<div>
<span className="chat-title">{tab.name}</span>
</div>
<span className="chat-usercount">{usercount}</span>
<span className="chat-usercount">{usercount || null}</span>
</div>
);
}

13
client/src/js/components/TabListItem.jsx
View file

@ -5,14 +5,10 @@ var selectedTabStore = require('../stores/selectedTab');
var tabActions = require('../actions/tab');
var TabListItem = React.createClass({
mixins: [
Reflux.connect(selectedTabStore, 'selectedTab')
],
mixins: [Reflux.connect(selectedTabStore)],
getInitialState: function() {
return {
selectedTab: selectedTabStore.getState()
};
return selectedTabStore.getState();
},
handleClick: function() {
@ -20,15 +16,14 @@ var TabListItem = React.createClass({
},
render: function() {
var selected = this.state.selectedTab;
var classes = [];
if (!this.props.channel) {
classes.push('tab-server');
}
if (this.props.server === selected.server &&
this.props.channel === selected.channel) {
if (this.props.server === this.state.server &&
this.props.channel === this.state.channel) {
classes.push('selected');
}