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

Make React Infinite stop throwing when theres only one child

Browse Source
This commit is contained in:
khlieng 2015-02-16 00:02:21 +01:00
parent ae78ac5017
commit fb77c29fd9
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/js/components/MessageBox.jsx
View File

@ -88,6 +88,7 @@ var MessageBox = React.createClass({
return <p className="message">{line}</p>; return <p className="message">{line}</p>;
}); });
if (lines.length !== 1) {
return ( return (
<div className="messagebox" style={style}> <div className="messagebox" style={style}>
<Infinite ref="list" containerHeight={this.state.height} elementHeight={24}> <Infinite ref="list" containerHeight={this.state.height} elementHeight={24}>
@ -95,6 +96,13 @@ var MessageBox = React.createClass({
</Infinite> </Infinite>
</div> </div>
); );
} else {
return (
<div className="messagebox" style={style}>
<div ref="list">{lines}</div>
</div>
);
}
} }
}); });

3
client/src/js/stores/selectedTab.js
View File

@ -54,7 +54,8 @@ var selectedTabStore = Reflux.createStore({
userAdded: function(user, server, channel) { userAdded: function(user, server, channel) {
// Update the selected channel incase the casing is different // Update the selected channel incase the casing is different
if (server === selectedTab.server && if (selectedTab.channel &&
server === selectedTab.server &&
user === serverStore.getNick(server) && user === serverStore.getNick(server) &&
channel.toLowerCase() === selectedTab.channel.toLowerCase()) { channel.toLowerCase() === selectedTab.channel.toLowerCase()) {
selectedTab.channel = channel; selectedTab.channel = channel;